fixes of storing users and apps

euclid/database/database.py

@@ -27,10 +27,11 @@ def save_user(user_id, email, password):
         return user
     except DoesNotExist:
         try:
-            return User.create(id=user_id, email=email, password=password)
-        except IntegrityError as e:
             existing_user = User.get(User.email == email)
             return existing_user
+        except DoesNotExist:
+            return User.create(id=user_id, email=email, password=password)
+
 
 
 def get_user(user_id=None, email=None):
@@ -53,12 +54,27 @@ def get_user(user_id=None, email=None):
 def save_app(args):
     try:
         app = App.get(App.id == args['app_id'])
+        for key, value in args.items():
+            if key != 'app_id' and value is not None:
+                setattr(app, key, value)
+        app.save()
     except DoesNotExist:
-        try:
-            user = get_user(user_id=args['user_id'])
-        except ValueError:
-            user = save_user(args['user_id'], args['email'], args['password'])
-        app = App.create(id=args['app_id'], user=user, app_type=args['app_type'], name=args['name'])
+        if args.get('user_id') is not None:
+            try:
+                user = get_user(user_id=args['user_id'])
+            except ValueError:
+                user = save_user(args['user_id'], args['email'], args['password'])
+                args['user_id'] = user.id
+                args['email'] = user.email
+        else:
+            user = None
+
+        app = App.create(
+            id=args['app_id'],
+            user=user,
+            app_type=args.get('app_type'),
+            name=args.get('name')
+        )
 
     return app
 
@@ -140,7 +156,7 @@ def save_development_step(app_id, prompt_path, prompt_data, llm_req_num, message
     app = get_app(app_id)
     hash_id = hash_data({
         'prompt_path': prompt_path,
-        'prompt_data': {k: v for k, v in prompt_data.items() if k not in {"directory_tree"}},
+        'prompt_data': {k: v for k, v in (prompt_data.items() if prompt_data is not None else {}) if k not in {"directory_tree"}},
         'llm_req_num': llm_req_num
     })
     try:
@@ -234,15 +250,22 @@ def get_user_input_from_hash_id(project, query):
 
 
 def get_development_step_from_hash_id(app_id, prompt_path, prompt_data, llm_req_num):
+    if prompt_data is None:
+        prompt_data_dict = {}
+    else:
+        prompt_data_dict = {k: v for k, v in prompt_data.items() if k not in {"directory_tree"}}
+
     hash_id = hash_data({
         'prompt_path': prompt_path,
-        'prompt_data': {k: v for k, v in prompt_data.items() if k not in {"directory_tree"}},
+        'prompt_data': prompt_data_dict,
         'llm_req_num': llm_req_num
     })
+
     try:
         dev_step = DevelopmentSteps.get((DevelopmentSteps.hash_id == hash_id) & (DevelopmentSteps.app == app_id))
     except DoesNotExist:
         return None
+
     return dev_step