Explicitly create response objects (#1)

Author: oeken

needle/v1/collections/__init__.py

@@ -62,7 +62,15 @@ def create(self, name: str, file_ids: Optional[list[str]] = None):
             error = body.get("error")
             raise Error(**error)
         c = body.get("result")
-        return Collection(**c)
+        return Collection(
+            id=c.get("id"),
+            name=c.get("name"),
+            embedding_model=c.get("embedding_model"),
+            embedding_dimensions=c.get("embedding_dimensions"),
+            search_queries=c.get("search_queries"),
+            created_at=c.get("created_at"),
+            updated_at=c.get("updated_at"),
+        )
 
     def get(self, collection_id: str):
         """
@@ -83,7 +91,15 @@ def get(self, collection_id: str):
             error = body.get("error")
             raise Error(**error)
         c = body.get("result")
-        return Collection(**c)
+        return Collection(
+            id=c.get("id"),
+            name=c.get("name"),
+            embedding_model=c.get("embedding_model"),
+            embedding_dimensions=c.get("embedding_dimensions"),
+            search_queries=c.get("search_queries"),
+            created_at=c.get("created_at"),
+            updated_at=c.get("updated_at"),
+        )
 
     def list(self):
         """
@@ -100,7 +116,18 @@ def list(self):
         if resp.status_code >= 400:
             error = body.get("error")
             raise Error(**error)
-        return [Collection(**c) for c in body.get("result")]
+        return [
+            Collection(
+                id=c.get("id"),
+                name=c.get("name"),
+                embedding_model=c.get("embedding_model"),
+                embedding_dimensions=c.get("embedding_dimensions"),
+                search_queries=c.get("search_queries"),
+                created_at=c.get("created_at"),
+                updated_at=c.get("updated_at"),
+            )
+            for c in body.get("result")
+        ]
 
     def search(self, collection_id: str, text: str):
         """
@@ -122,4 +149,10 @@ def search(self, collection_id: str, text: str):
         if resp.status_code >= 400:
             error = body.get("error")
             raise Error(**error)
-        return [SearchResult(**c) for c in body.get("result")]
+        return [
+            SearchResult(
+                content=r.get("content"),
+                file_id=r.get("file_id"),
+            )
+            for r in body.get("result")
+        ]

needle/v1/collections/files.py

@@ -50,7 +50,22 @@ def add(self, collection_id: str, files: list[FileToAdd]):
         if resp.status_code >= 400:
             error = body.get("error")
             raise Error(**error)
-        return [CollectionFile(**cf) for cf in body.get("result")]
+        return [
+            CollectionFile(
+                id=cf.get("id"),
+                name=cf.get("name"),
+                type=cf.get("type"),
+                url=cf.get("url"),
+                user_id=cf.get("user_id"),
+                connector_id=cf.get("connector_id"),
+                size=cf.get("size"),
+                md5_hash=cf.get("md5_hash"),
+                created_at=cf.get("created_at"),
+                updated_at=cf.get("updated_at"),
+                status=cf.get("status"),
+            )
+            for cf in body.get("result")
+        ]
 
     def list(self, collection_id: str):
         """
@@ -71,4 +86,19 @@ def list(self, collection_id: str):
         if resp.status_code >= 400:
             error = body.get("error")
             raise Error(**error)
-        return [CollectionFile(**cf) for cf in body.get("result")]
+        return [
+            CollectionFile(
+                id=cf.get("id"),
+                name=cf.get("name"),
+                type=cf.get("type"),
+                url=cf.get("url"),
+                user_id=cf.get("user_id"),
+                connector_id=cf.get("connector_id"),
+                size=cf.get("size"),
+                md5_hash=cf.get("md5_hash"),
+                created_at=cf.get("created_at"),
+                updated_at=cf.get("updated_at"),
+                status=cf.get("status"),
+            )
+            for cf in body.get("result")
+        ]