get_app_by_user_workspace(user_id, workspace)

pilot/utils/arguments.py

@@ -3,7 +3,7 @@ import uuid
 
 from termcolor import colored
 
-from database.database import get_app
+from database.database import get_app, get_app_by_user_workspace
 
 
 def get_arguments():
@@ -22,24 +22,40 @@ def get_arguments():
         else:
             arguments[arg] = True
 
+    if 'user_id' not in arguments:
+        arguments['user_id'] = str(uuid.uuid4())
+
+    app = None
+    if 'workspace' in arguments:
+        app = get_app_by_user_workspace(arguments['user_id'], arguments['workspace'])
+        if app is not None:
+            arguments['app_id'] = app.id
+    else:
+        arguments['workspace'] = None
+
     if 'app_id' in arguments:
         try:
+            if app is None:
             app = get_app(arguments['app_id'])
-            arguments['user_id'] = str(app.user.id)
+
+            # arguments['user_id'] = str(app.user.id)
             arguments['app_type'] = app.app_type
             arguments['name'] = app.name
             # Add any other fields from the App model you wish to include
+
+            print(colored('\n------------------ LOADING PROJECT ----------------------', 'green', attrs=['bold']))
+            print(colored(f'{app.name} (app_id={arguments["app_id"]})', 'green', attrs=['bold']))
+            print(colored('--------------------------------------------------------------\n', 'green', attrs=['bold']))
         except ValueError as e:
             print(e)
             # Handle the error as needed, possibly exiting the script
     else:
         arguments['app_id'] = str(uuid.uuid4())
 
-    if 'workspace' not in arguments:
-        arguments['workspace'] = None
-
-    if 'user_id' not in arguments:
-        arguments['user_id'] = str(uuid.uuid4())
+        print(colored('\n------------------ STARTING NEW PROJECT ----------------------', 'green', attrs=['bold']))
+        print(f"If you wish to continue with this project in future run:")
+        print(colored(f'python {sys.argv[0]} app_id={arguments["app_id"]}', 'green', attrs=['bold']))
+        print(colored('--------------------------------------------------------------\n', 'green', attrs=['bold']))
 
     if 'email' not in arguments:
         # todo change email so its not uuid4 but make sure to fix storing of development steps where
@@ -52,8 +68,4 @@ def get_arguments():
     if 'step' not in arguments:
         arguments['step'] = None
 
-    print(colored('\n------------------ STARTING NEW PROJECT ----------------------', 'green', attrs=['bold']))
-    print(f"If you wish to continue with this project in future run:")
-    print(colored(f'python main.py app_id={arguments["app_id"]}', 'green', attrs=['bold']))
-    print(colored('--------------------------------------------------------------\n', 'green', attrs=['bold']))
     return arguments

pilot/utils/files.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-
+from database.database import save_user_app
 
 def get_parent_folder(folder_name):
     current_path = Path(os.path.abspath(__file__))  # get the path of the current script
@@ -13,6 +13,11 @@ def get_parent_folder(folder_name):
 
 def setup_workspace(args):
     if args['workspace'] is not None:
+        try:
+            save_user_app(args['user_id'], args['app_id'], args['workspace'])
+        except Exception as e:
+            print(str(e))
+
         return args['workspace']
 
     root = get_parent_folder('pilot')