Merge pull request #46 from CoopHive/hive-inspect

hive inspect

cmd/hive/inspect.go

@@ -0,0 +1,55 @@
+package hive
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/CoopHive/coophive/pkg/inspect"
+	optionsfactory "github.com/CoopHive/coophive/pkg/options"
+	"github.com/CoopHive/coophive/pkg/web3"
+	"github.com/spf13/cobra"
+)
+
+func newInspectCmd() *cobra.Command {
+	options := optionsfactory.NewInspectOptions()
+	runCmd := &cobra.Command{
+		Use:     "inspect",
+		Short:   "View metadata for a previously run job.",
+		Long:    "View metadata for a previously run job.",
+		Example: "inspect cowsay:v0.0.1 -i Message=moo",
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			options, err := optionsfactory.ProcessInspectOptions(options, args)
+			if err != nil {
+				return err
+			}
+			return inspectJob(cmd, options)
+		},
+	}
+	optionsfactory.AddInspectCliFlags(runCmd, &options)
+	return runCmd
+}
+
+func inspectJob(cmd *cobra.Command, options inspect.InspectOptions) error {
+	web3SDK, err := web3.NewContractSDK(options.Web3)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("deal id: %s\n", options.DealID)
+
+	dealData, err := web3SDK.Contracts.Storage.GetDeal(web3SDK.CallOpts, options.DealID)
+	if err != nil {
+		return err
+	}
+
+	jsonBytes, err := json.Marshal(dealData)
+	if err != nil {
+		return err
+	}
+
+	jsonString := string(jsonBytes)
+	fmt.Println(jsonString)
+
+	return nil
+}

cmd/hive/root.go

@@ -25,6 +25,7 @@ func NewRootCmd() *cobra.Command {
 	RootCmd.AddCommand(newMediatorCmd())
 	RootCmd.AddCommand(newJobCreatorCmd())
 	RootCmd.AddCommand(newSaasApiCmd())
+	RootCmd.AddCommand(newInspectCmd())
 	return RootCmd
 }
 

cmd/hive/run.go

@@ -124,12 +124,16 @@ Generic Decentralized Compute Network https://github.com/CoopHive/coophive
 		return err
 	}
 	spinner.Stop()
-	fmt.Printf("\n🍂 Generic Decentralized Compute Network job completed, try 👇\n    open %s\n    cat %s/stdout\n    cat %s/stderr\n    https://ipfs.io/ipfs/%s\n",
-		solver.GetDownloadsFilePath(result.JobOffer.DealID),
-		solver.GetDownloadsFilePath(result.JobOffer.DealID),
-		solver.GetDownloadsFilePath(result.JobOffer.DealID),
-		result.Result.DataID,
-	)
+
+	downloadFilePath := solver.GetDownloadsFilePath(result.JobOffer.DealID)
+	fmt.Printf("\n🍂 Generic Decentralized Compute Network job completed, try 👇\n")
+	fmt.Printf("\topen %s\n", downloadFilePath)
+	fmt.Printf("\tcat %s/stdout\n", downloadFilePath)
+	fmt.Printf("\tcat %s/stderr\n", downloadFilePath)
+	fmt.Printf("\thttps://ipfs.io/ipfs/%s\n", result.Result.DataID)
+
+	fmt.Printf("\nFor more details try: hive inspect %s\n", result.JobOffer.DealID)
+
 	return err
 }
 

pkg/inspect/inspect.go

@@ -0,0 +1,8 @@
+package inspect
+
+import "github.com/CoopHive/coophive/pkg/web3"
+
+type InspectOptions struct {
+	Web3   web3.Web3Options
+	DealID string
+}

pkg/options/inspect.go

@@ -0,0 +1,48 @@
+package options
+
+import (
+	"github.com/CoopHive/coophive/pkg/inspect"
+	"github.com/CoopHive/coophive/pkg/system"
+	"github.com/spf13/cobra"
+)
+
+func NewInspectOptions() inspect.InspectOptions {
+	options := inspect.InspectOptions{
+		Web3:   GetDefaultWeb3Options(),
+		DealID: "",
+	}
+	options.Web3.Service = system.JobCreatorService
+	return options
+}
+
+func ProcessInspectOptions(options inspect.InspectOptions, args []string) (inspect.InspectOptions, error) {
+	dealId := ""
+	if len(args) == 1 {
+		dealId = args[0]
+	}
+
+	if dealId != "" {
+		options.DealID = dealId
+	}
+	newWeb3Options, err := ProcessWeb3Options(options.Web3)
+	if err != nil {
+		return options, err
+	}
+	options.Web3 = newWeb3Options
+
+	return options, CheckInspectOptions(options)
+}
+
+func CheckInspectOptions(options inspect.InspectOptions) error {
+	err := CheckWeb3Options(options.Web3)
+	if err != nil {
+		return err
+	}
+
+	// TODO validate dealID
+	return nil
+}
+
+func AddInspectCliFlags(cmd *cobra.Command, options *inspect.InspectOptions) {
+	AddWeb3CliFlags(cmd, &options.Web3)
+}

stack

@@ -129,6 +129,8 @@ function faucet() {
   local tokenAddress=$(echo -n "$WEB3_TOKEN_ADDRESS" | sed 's/^0x//')
   if [[ -n $LOCAL_GETH ]]; then
     export WEB3_PROVIDER=${WEB3_PROVIDER:="http://host.docker.internal:8545"}
+    echo provider: $WEB3_PROVIDER
+    echo docker network: $GETH_DOCKER_NETWORK
   else
     export WEB3_PROVIDER=${WEB3_PROVIDER:="http://geth:8545"}
   fi