Add to fastapi

chroma-core · Oct 23, 2023 · 6bcb1fd · 6bcb1fd
1 parent 5baf290
commit 6bcb1fd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/chromadb/api/client.py b/chromadb/api/client.py
@@ -390,11 +390,11 @@ def max_batch_size(self) -> int:
 
     @override
     def set_tenant_and_database(self, tenant: str, database: str) -> None:
-        self._validate_tenant_database(database, self.tenant)
+        self._validate_tenant_database(tenant=tenant, database=database)
         self.tenant = tenant
         self.database = database
 
-    def _validate_tenant_database(self, database: str, tenant: str) -> None:
+    def _validate_tenant_database(self, tenant: str, database: str) -> None:
         try:
             self._admin_client.get_tenant(name=tenant)
         except Exception:

diff --git a/chromadb/server/fastapi/__init__.py b/chromadb/server/fastapi/__init__.py
@@ -39,6 +39,7 @@
 
 import logging
 from chromadb.telemetry import ServerContext, Telemetry
+from chromadb.types import Database, Tenant
 
 logger = logging.getLogger(__name__)
 
@@ -142,13 +143,27 @@ def __init__(self, settings: Settings):
             response_model=None,
         )
 
+        self.router.add_api_route(
+            "/api/v1/databases/{database}",
+            self.get_database,
+            methods=["GET"],
+            response_model=None,
+        )
+
         self.router.add_api_route(
             "/api/v1/tenants",
             self.create_tenant,
             methods=["POST"],
             response_model=None,
         )
 
+        self.router.add_api_route(
+            "/api/v1/tenants/{tenant}",
+            self.get_tenant,
+            methods=["GET"],
+            response_model=None,
+        )
+
         self.router.add_api_route(
             "/api/v1/collections",
             self.list_collections,
@@ -245,9 +260,15 @@ def create_database(
     ) -> None:
         return self._api.create_database(database.name, tenant)
 
+    def get_database(self, database: str, tenant: str = DEFAULT_TENANT) -> Database:
+        return self._api.get_database(database, tenant)
+
     def create_tenant(self, tenant: CreateTenant) -> None:
         return self._api.create_tenant(tenant.name)
 
+    def get_tenant(self, tenant: str) -> Tenant:
+        return self._api.get_tenant(tenant)
+
     def list_collections(
         self, tenant: str = DEFAULT_TENANT, database: str = DEFAULT_DATABASE
     ) -> Sequence[Collection]: