Obseleting server.py, making direct calls in main

main.py

@@ -1,5 +1,5 @@
 import fastapi
-import json
+import json,time
 import uvicorn
 from fastapi import HTTPException , status
 from fastapi.responses import JSONResponse
@@ -8,6 +8,8 @@ from fastapi import FastAPI as Response
 from sse_starlette.sse import EventSourceResponse
 from starlette.responses import StreamingResponse
 from starlette.requests import Request
+import chromadb
+from chromadb.config import Settings, System
 from pydantic import BaseModel
 from typing import List, Dict, Any, Generator, Optional, cast, Callable
 from server import client
@@ -83,13 +85,17 @@ app.add_middleware(
     allow_headers=["*"],
 )
 api_base="/api/v1"
-bkend=client()
+embedding_function=ef.DefaultEmbeddingFunction()
+bkend=chromadb.Client(Settings(
+            chroma_db_impl="duckdb+parquet",
+            persist_directory="./index/chroma" # Optional, defaults to .chromadb/ in the current directory
+        ))
 
     
 @app.get(api_base+"")
 def heartbeat():
     print("Received heartbeat request")
-    return bkend.heartbeat()
+    return {"nanosecond heartbeat":int(time.time_ns())}
 
 @app.post(api_base+"/reset")
 def reset():
@@ -99,7 +105,7 @@ def reset():
 @app.get(api_base+"/version")
 def version():
     print("Received version request")
-    return bkend.version()
+    return bkend.get_version()
 
 @app.post(api_base+"/persist")
 def persist():
@@ -109,12 +115,12 @@ def persist():
 @app.post(api_base+"/raw_sql")
 def raw_sql(raw_sql: RawSql):
     print("Received raw_sql request")
-    return bkend.raw_sql(raw_sql)
+    return bkend.raw_sql(raw_sql.raw_sql)
 
 @app.get(api_base+"/heartbeat")
-def heartbeat():
-    print("Received heartbeat request")
-    return bkend.heartbeat()
+def heartbeat1():
+    print("Received heartbeat1 request")
+    return heartbeat()
 
 @app.get(api_base+"/collections")
 def list_collections():
@@ -124,12 +130,12 @@ def list_collections():
 @app.post(api_base+"/collections")
 def create_collection( collection: CreateCollection ) -> Collection:
     print("Received request to create_collection")
-    return bkend.create_collection(name=collection.name,metadata=collection.metadata,get_or_create=collection.get_or_create)
+    return bkend.create_collection(name=collection.name,metadata=collection.metadata,embedding_function=embedding_function,get_or_create=collection.get_or_create)
 
 @app.get(api_base+"/collections/{collection_name}")
 def get_collection( collection_name: str) -> Collection:
     print("Received get_collection request")
-    return bkend.get_collection(collection_name)
+    return bkend.get_collection(collection_name,embedding_function=embedding_function)
 
 @app.post(api_base+"/collections/{collection_id}/add")
 def add(collection_id:str , add:AddEmbedding) -> None:
@@ -143,35 +149,35 @@ def add(collection_id:str , add:AddEmbedding) -> None:
 @app.post(api_base+"/collections/{collection_id}/update")
 def update(collection_id:str , update:UpdateEmbedding) -> None:
     print("Received update request")
-    return bkend.update(ids=update.ids, collection_id=_uuid(collection_id), embeddings=update.embeddings, documents=update.documents, metadatas=update.metadatas)
+    return bkend._update(ids=update.ids, collection_id=_uuid(collection_id), embeddings=update.embeddings, documents=update.documents, metadatas=update.metadatas)
         
 @app.post(api_base+"/collections/{collection_id}/upsert")
 def upsert(collection_id:str, upsert: AddEmbedding):
     print("Received upsert request")
-    return bkend.upsert(collection_id=_uuid(collection_id),embeddings=upsert.embeddings,metadatas=upsert.metadatas,documents=upsert.documents,ids=upsert.ids,increment_index=upsert.increment_index)
+    return bkend._upsert(collection_id=_uuid(collection_id),embeddings=upsert.embeddings,metadatas=upsert.metadatas,documents=upsert.documents,ids=upsert.ids,increment_index=upsert.increment_index)
         
 @app.post(api_base+"/collections/{collection_id}/get") 
 def get(self, collection_id: str, get: GetEmbedding) -> GetResult:
     print("Received get request")
-    return bkend.get(collection_id=_uuid(collection_id), ids=get.ids, where=get.where,
+    return bkend._get(collection_id=_uuid(collection_id), ids=get.ids, where=get.where,
             where_document=get.where_document, sort=get.sort, limit=get.limit,
             offset=get.offset, include=get.include)
         
 @app.post(api_base+"/collections/{collection_id}/delete")
 def delete(collection_id: str, delete: DeleteEmbedding) -> List[UUID]:
     print("Received delete request")
-    return bkend.delete(where=delete.where, ids=delete.ids,
+    return bkend._delete(where=delete.where, ids=delete.ids,
             collection_id=_uuid(collection_id), where_document=delete.where_document)
         
 @app.get(api_base+"/collections/{collection_id}/count")
 def count(collection_id:str) ->int:
     print("Received count request")
-    return bkend.count(_uuid(collection_id))
+    return bkend._count(_uuid(collection_id))
         
 @app.post(api_base+"/collections/{collection_id}/query")
 def get_nearest_neighbors(collection_id: str, query: QueryEmbedding) -> QueryResult:
     print("Received get_nearest_neighbors request")
-    return bkend.get_nearest_neighbors(collection_id=_uuid(collection_id), where=query.where,  where_document=query.where_document, 
+    return bkend._query(collection_id=_uuid(collection_id), where=query.where,  where_document=query.where_document, 
               query_embeddings=query.query_embeddings, n_results=query.n_results, include=query.include)
         
 @app.post(api_base+"/collections/{collection_name}/create_index")
@@ -179,15 +185,10 @@ def create_index(collection_name:str)-> bool:
     print("Received create_index request")
     return bkend.create_index(collection_name)
         
-@app.get(api_base+"/collections/{collection_name}")
-def get_collection2( collection_name: str) -> Collection:
-    print("Received get_collection2 request")
-    return bkend.get_collection(collection_name)
-        
 @app.post(api_base+"/collections/{collection_id}")
 def modify(collection_id: str, collection: UpdateCollection) -> None:
-    print("Received modify(collection) request")
-    return bkend.modify(id=_uuid(collection_id), new_name=collection.new_name, new_metadata=collection.new_metadata)
+    print("Received modify-collection request")
+    return bkend._modify(id=_uuid(collection_id), new_name=collection.new_name, new_metadata=collection.new_metadata)
         
 @app.delete(api_base+"/collections/{collection_name}")
 def delete_collection(collection_name:str) -> None:

server.py

@@ -131,7 +131,7 @@ class client():
         return self.db._delete(where=where, ids=ids, collection_id=collection_id, where_document=where_document)
 
     def count(self, collection_id: UUID) -> int:
-        return self.db._.count(collection_id)
+        return self.db._count(collection_id)
     
     def get_nearest_neighbors( self, collection_id: UUID, query_embeddings: Embeddings,
         n_results: int = 10, where: Where = {}, where_document: WhereDocument = {},