Skip to content

Commit

Permalink
Fixed codegen library usage
Browse files Browse the repository at this point in the history
  • Loading branch information
frikky committed Jan 12, 2025
1 parent e976c0c commit d920d3c
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
24 changes: 22 additions & 2 deletions app_upload/stitcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/shuffle/shuffle-shared"

"archive/zip"
"runtime"
"bytes"
"context"
"crypto/md5"
Expand All @@ -20,6 +21,7 @@ import (
"log"
"net/http"
"os"
"os/user"
"path/filepath"
"strings"
"time"
Expand All @@ -42,8 +44,8 @@ var appSearchIndex = "appsearch"

// CONFIGURE APP LOCATIONS TO USE
// ALSO REQUIRES ACCESS TO UPLOAD TO CLOUD
var appbasefile = "/Users/frikky/git/app_sdk/shuffle_sdk/shuffle_sdk.py"
var appfolder = "/Users/frikky/git/python-apps"
var appbasefile = "/home/$USER/git/app_sdk/shuffle_sdk/shuffle_sdk.py"
var appfolder = "/home/$USER/git/python-apps"
var baseUrl = ""
var apikey = ""

Expand Down Expand Up @@ -833,6 +835,24 @@ func main() {
gceRegion = os.Getenv("SHUFFLE_GCEPROJECT_REGION")
}

// Check if macos, then replace /home/ with /Users/
if runtime.GOOS == "darwin" {
log.Printf("[INFO] Running on MacOS. Replacing /home/ with /Users/")
appbasefile = strings.Replace(appbasefile, "/home/", "/Users/", -1)
appfolder = strings.Replace(appfolder, "/home/", "/Users/", -1)
}

if strings.Contains(appbasefile, "$USER") || strings.Contains(appfolder, "$USER") {
log.Printf("[INFO] Replacing $USER with current user in paths")
currentUser, err := user.Current()
if err != nil {
log.Fatalf("[WARNING] Error getting current user: %v", err)
}

appbasefile = strings.Replace(appbasefile, "$USER", currentUser.Username, -1)
appfolder = strings.Replace(appfolder, "$USER", currentUser.Username, -1)
}

baseUrl = os.Args[2]
apikey = os.Args[1]
log.Printf("\n\n============================= \n[INFO] Running with: \nUrl: %s\nApikey: %s\n============================= \n\n", baseUrl, apikey)
Expand Down
2 changes: 1 addition & 1 deletion codegen.go
Original file line number Diff line number Diff line change
Expand Up @@ -3643,7 +3643,7 @@ func HandlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
}

func GetAppRequirements() string {
return "requests==2.25.1\nurllib3==1.25.9\nliquidpy==0.8.2\nMarkupSafe==2.0.1\nflask[async]==2.0.2\npython-dateutil==2.8.1\nPyJWT==2.9.0\n"
return "requests==2.32.3\nurllib3==2.3.0\nliquidpy==0.8.2\nMarkupSafe==3.0.2\nflask[async]==3.1.0\npython-dateutil==2.9.0.post0\nPyJWT==2.10.1\n"
}

// Removes JSON values from the input
Expand Down

0 comments on commit d920d3c

Please sign in to comment.