From ef7d1b3bc749752ae9080efb7bfe9ee43e444eab Mon Sep 17 00:00:00 2001
From: Vasilije <8619304+Vasilije1990@users.noreply.github.com>
Date: Fri, 17 Nov 2023 21:04:53 +0100
Subject: [PATCH] Fixed api issues, missing deps and got first endpoint to work

---
 .../database/postgres/models/memory.py        |  2 +-
 .../vectorstore_manager.py                    | 23 +++++++++++--------
 level_4/main.py                               |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/level_4/cognitive_architecture/database/postgres/models/memory.py b/level_4/cognitive_architecture/database/postgres/models/memory.py
index ee856f677..b5523079d 100644
--- a/level_4/cognitive_architecture/database/postgres/models/memory.py
+++ b/level_4/cognitive_architecture/database/postgres/models/memory.py
@@ -10,7 +10,7 @@ class MemoryModel(Base):
 
     id = Column(String, primary_key=True)
     user_id = Column(String, ForeignKey('users.id'), index=True)
-    operation_id = Column(String, ForeignKey('operations.id'), index=True)
+    operation_id = Column(String, nullable=True)
     memory_name = Column(String, nullable=True)
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, onupdate=datetime.utcnow)
diff --git a/level_4/cognitive_architecture/vectorstore_manager.py b/level_4/cognitive_architecture/vectorstore_manager.py
index 05cf3fa78..89a66fc4c 100644
--- a/level_4/cognitive_architecture/vectorstore_manager.py
+++ b/level_4/cognitive_architecture/vectorstore_manager.py
@@ -146,6 +146,7 @@ class Memory:
         namespace: str = None,
         memory_id: str = None,
         memory_class = None,
+        job_id:str = None
     ) -> None:
         self.load_environment_variables()
         self.memory_id = memory_id
@@ -156,6 +157,7 @@ class Memory:
         self.namespace = namespace
         self.memory_instances = []
         self.memory_class = memory_class
+        self.job_id=job_id
         # self.memory_class = DynamicBaseMemory(
         #     "Memory", user_id, str(self.memory_id), index_name, db_type, namespace
         # )
@@ -194,10 +196,10 @@ class Memory:
             )
 
         memory_class = DynamicBaseMemory(
-            memory_label, user_id, str(memory_id), index_name=memory_label, db_type='weaviate', **kwargs
+            memory_label, user_id, str(memory_id), index_name=memory_label , db_type='weaviate', **kwargs
         )
 
-        return cls(user_id=user_id, session=session, memory_id=memory_id, memory_class=memory_class, **kwargs)
+        return cls(user_id=user_id, session=session, memory_id=memory_id, job_id =job_id, memory_class=memory_class, **kwargs)
 
     async def list_memory_classes(self):
         """
@@ -267,6 +269,7 @@ class Memory:
         """
         try:
             memory_id = str(uuid.uuid4())
+            logging.info("Job id %s", job_id)
             memory = MemoryModel(
                 id=memory_id,
                 user_id=user_id,
@@ -458,15 +461,15 @@ async def main():
         await memory.add_dynamic_memory_class("semanticmemory", "SEMANTICMEMORY")
         await memory.add_method_to_class(memory.semanticmemory_class, "add_memories")
         await memory.add_method_to_class(memory.semanticmemory_class, "fetch_memories")
-        # sss = await memory.dynamic_method_call(memory.semanticmemory_class, 'add_memories',
-        #                                                 observation='some_observation', params=params, loader_settings=loader_settings)
+        sss = await memory.dynamic_method_call(memory.semanticmemory_class, 'add_memories',
+                                                        observation='some_observation', params=params, loader_settings=loader_settings)
 
-        susu = await memory.dynamic_method_call(
-            memory.semanticmemory_class,
-            "fetch_memories",
-            observation="document summary",
-        )
-        print(susu)
+        # susu = await memory.dynamic_method_call(
+        #     memory.semanticmemory_class,
+        #     "fetch_memories",
+        #     observation="document summary",
+        # )
+        # print(susu)
 
     # Adding a dynamic memory class
     # dynamic_memory = memory.add_dynamic_memory_class("DynamicMemory", "ExampleNamespace")
diff --git a/level_4/main.py b/level_4/main.py
index be253a13e..80770da0d 100644
--- a/level_4/main.py
+++ b/level_4/main.py
@@ -504,8 +504,8 @@ async def main():
             "source": "URL",
             "path": ["https://www.ibiblio.org/ebooks/London/Call%20of%20Wild.pdf"],
         }
-        # await load_documents_to_vectorstore(session, user_id, loader_settings=loader_settings)
-        await user_query_to_graph_db(session, user_id, "I walked in the forest yesterday and added to my list I need to buy some milk in the store")
+        await load_documents_to_vectorstore(session, user_id, loader_settings=loader_settings)
+        # await user_query_to_graph_db(session, user_id, "I walked in the forest yesterday and added to my list I need to buy some milk in the store")
         # await add_documents_to_graph_db(session, user_id)
         # memory_instance = Memory(namespace='SEMANTICMEMORY')
         # sss = await memory_instance.dynamic_method_call(memory_instance.semantic_memory_class, 'fetch_memories', observation='some_observation')