RSDK-9607: add build and run options for all Python modules; remove run option for Go (viamrobotics#4818)

Author: purplenicole730

cli/module_generate.go

@@ -153,12 +153,6 @@ func (c *viamClient) generateModuleAction(cCtx *cli.Context, args generateModule
 			warningf(cCtx.App.ErrWriter, err.Error())
 			nonFatalError = true
 		}
-
-		s.Title("Generating cloud build requirements...")
-		if err = generateCloudBuild(cCtx, *newModule, globalArgs); err != nil {
-			warningf(cCtx.App.ErrWriter, err.Error())
-			nonFatalError = true
-		}
 	}
 
 	if globalArgs.Debug {
@@ -743,32 +737,6 @@ func getLatestSDKTag(c *cli.Context, language string, globalArgs globalArgs) (st
 	return version, nil
 }
 
-func generateCloudBuild(c *cli.Context, module modulegen.ModuleInputs, globalArgs globalArgs) error {
-	debugf(c.App.Writer, globalArgs.Debug, "Setting cloud build functionality to %v", module.EnableCloudBuild)
-	switch module.Language {
-	case python:
-		if module.EnableCloudBuild {
-			err := os.Remove(filepath.Join(module.ModuleName, "run.sh"))
-			if err != nil {
-				return err
-			}
-		} else {
-			err := os.Remove(filepath.Join(module.ModuleName, "build.sh"))
-			if err != nil {
-				return err
-			}
-		}
-	case golang:
-		if module.EnableCloudBuild {
-			err := os.Remove(filepath.Join(module.ModuleName, "run.sh"))
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 func createModuleAndManifest(cCtx *cli.Context, c *viamClient, module modulegen.ModuleInputs, globalArgs globalArgs) error {
 	var moduleID moduleID
 	if module.RegisterOnApp {
@@ -846,29 +814,25 @@ func renderManifest(c *cli.Context, moduleID string, module modulegen.ModuleInpu
 	}
 	switch module.Language {
 	case python:
+		manifest.Build = &manifestBuildInfo{
+			Setup: "./setup.sh",
+			Build: "./build.sh",
+			Path:  "dist/archive.tar.gz",
+			Arch:  []string{"linux/amd64", "linux/arm64"},
+		}
 		if module.EnableCloudBuild {
-			manifest.Build = &manifestBuildInfo{
-				Setup: "./setup.sh",
-				Build: "./build.sh",
-				Path:  "dist/archive.tar.gz",
-				Arch:  []string{"linux/amd64", "linux/arm64"},
-			}
 			manifest.Entrypoint = "dist/main"
 		} else {
 			manifest.Entrypoint = "./run.sh"
 		}
 	case golang:
-		if module.EnableCloudBuild {
-			manifest.Build = &manifestBuildInfo{
-				Setup: "make setup",
-				Build: "make module.tar.gz",
-				Path:  "bin/module.tar.gz",
-				Arch:  []string{"linux/amd64", "linux/arm64"},
-			}
-			manifest.Entrypoint = fmt.Sprintf("bin/%s", module.ModuleName)
-		} else {
-			manifest.Entrypoint = "./run.sh"
+		manifest.Build = &manifestBuildInfo{
+			Setup: "make setup",
+			Build: "make module.tar.gz",
+			Path:  "bin/module.tar.gz",
+			Arch:  []string{"linux/amd64", "linux/arm64"},
 		}
+		manifest.Entrypoint = fmt.Sprintf("bin/%s", module.ModuleName)
 	}
 
 	if err := writeManifest(filepath.Join(module.ModuleName, defaultManifestFilename), manifest); err != nil {

cli/module_generate/_templates/go/run.sh

@@ -1,6 +1,10 @@
 import asyncio
 from viam.module.module import Module
-from .models.{{ .ModelSnake }} import {{ .ModelPascal }}
+try:
+    from models.{{ .ModelSnake }} import {{ .ModelPascal }}
+except ModuleNotFoundError:
+    # when running as local module with run.sh
+    from .models.{{ .ModelSnake }} import {{ .ModelPascal }}
 
 
 if __name__ == '__main__':

cli/module_generate/_templates/python/src/tmpl-main.py

@@ -157,17 +157,6 @@ func TestGenerateModuleAction(t *testing.T) {
 		test.That(t, err, test.ShouldBeNil)
 	})
 
-	t.Run("test generate cloud build", func(t *testing.T) {
-		setupDirectories(cCtx, testModule.ModuleName, globalArgs)
-		err := generateCloudBuild(cCtx, testModule, globalArgs)
-		test.That(t, err, test.ShouldBeNil)
-
-		_, err = os.Stat(filepath.Join(modulePath, "run.sh"))
-		test.That(t, err, test.ShouldNotBeNil)
-		_, err = os.Stat(filepath.Join(modulePath, "build.sh"))
-		test.That(t, err, test.ShouldBeNil)
-	})
-
 	t.Run("test create module and manifest", func(t *testing.T) {
 		cCtx, ac, _, _ := setup(&inject.AppServiceClient{}, nil, &inject.BuildServiceClient{
 			StartBuildFunc: func(ctx context.Context, in *v1.StartBuildRequest, opts ...grpc.CallOption) (*v1.StartBuildResponse, error) {