databutton 0.38.3__tar.gz → 0.38.11__tar.gz

{databutton-0.38.3 → databutton-0.38.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: databutton
-Version: 0.38.3
+Version: 0.38.11
 Summary: The CLI for databutton.com
 License: Databutton
 Author: Databutton
@@ -13,8 +13,8 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: PyJWT (>=2.2.0,<3.0.0)
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: certifi (>=2022.12.7,<2023.0.0)
-Requires-Dist: chromadb (>=0.4.22,<0.5.0)
 Requires-Dist: cryptography (>=40.0.1,<41.0.0)
+Requires-Dist: fastapi
 Requires-Dist: httpx (>=0.20.0,<1)
 Requires-Dist: pandas[feather] (>=0.25,<3)
 Requires-Dist: pydantic (>=1,<3)
@@ -89,5 +89,3 @@ To test in another package, you can simply
 
 All rights reserved.
 
-
-

{databutton-0.38.3 → databutton-0.38.11}/README.md

@@ -65,5 +65,3 @@ To test in another package, you can simply
 ## License: Copyright (c) Databutton
 
 All rights reserved.
-
-

{databutton-0.38.3 → databutton-0.38.11}/databutton/__init__.py

@@ -5,7 +5,7 @@ Create data apps
 .. moduleauthor:: Databutton <support@databutton.com>
 """
 
-from . import experimental, notify, pydantic_v1, rag, secrets, storage
+from . import experimental, notify, pydantic_v1, secrets, storage
 from .cachetools import cache, clear_cache
 from .version import __version__
 
@@ -16,7 +16,6 @@ __all__ = [
     "storage",
     "cache",
     "clear_cache",
-    "rag",
     "__version__",
     "experimental",
 ]

{databutton-0.38.3 → databutton-0.38.11}/databutton/experimental/auth/get_user.py

@@ -1,8 +1,8 @@
 import re
 from datetime import datetime, timedelta
 
+import httpx
 import jwt
-import requests
 from cryptography.x509 import load_pem_x509_certificate
 from fastapi import HTTPException, Request, status
 from pydantic import BaseModel
@@ -17,11 +17,11 @@ class GooglePublicKeySet:
 
     def get_keys(self):
         # Load certs from Google
-        response = requests.get(
+        response = httpx.get(
             "https://www.googleapis.com/robot/v1/metadata/x509/securetoken@system.gserviceaccount.com"
         )
 
-        x509_certs = response.json()
+        x509_certs: dict = response.json()
 
         # Extract the public keys
         keys = {}

{databutton-0.38.3 → databutton-0.38.11}/databutton/experimental/folder/folder.py

@@ -42,6 +42,6 @@ def upload(key: str, folder_path: str):
 def download(key: str, folder_path: str):
     """Download and unzip a folder from blob storage."""
     normalized_folder_path = normalize_path(folder_path)
-    zipped_bytes = db.storage.binary.get(key, default=lambda: None)
+    zipped_bytes = db.storage.binary.get(key, default=None)
     if zipped_bytes is not None:
         unzip_bytes_to_folder(zipped_bytes, normalized_folder_path.as_posix())

{databutton-0.38.3 → databutton-0.38.11}/databutton/version.py

@@ -5,4 +5,4 @@ This module contains project version information.
 .. moduleauthor:: Databutton <support@databutton.com>
 """
 
-__version__ = "0.38.3"
+__version__ = "0.38.11"

{databutton-0.38.3 → databutton-0.38.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "databutton"
-version = "0.38.3"
+version = "0.38.11"
 description = "The CLI for databutton.com"
 authors = ["Databutton <hi@databutton.io>"]
 license = "Databutton"
@@ -17,7 +17,7 @@ PyYAML = "^6.0"
 tenacity = "^8.0.0"
 cryptography = "^40.0.1"
 certifi = "^2022.12.7"
-chromadb = "^0.4.22"
+fastapi = "*"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.2.0"
@@ -30,7 +30,7 @@ isort = "^5.12.0"
 python-semantic-release = "7.28.1"
 pytest-mock = "^3.7.0"
 pandas-stubs = "^1.5.2.221124"
-ruff = "^0.3.0"
+ruff = "^0.4.0"
 types-pyjwt = "^1.7.1"
 
 [build-system]

databutton-0.38.3/databutton/rag/__init__.py

@@ -1,5 +0,0 @@
-from .chroma import Chroma
-
-chroma = Chroma()
-
-__all__ = ["chroma"]

databutton-0.38.3/databutton/rag/chroma.py

@@ -1,35 +0,0 @@
-import os
-import shutil
-
-import chromadb
-
-import databutton as db
-
-
-class Chroma:
-    path = ".tmp/chroma/"
-    file_path = "path/chroma.sqlite3"
-
-    def __init__(self):
-        pass
-
-    def persist(self):
-        shutil.make_archive("chroma", "zip", self.path)
-        with open("chroma.zip", "rb") as file:
-            db.storage.binary.put("chromadb", file.read())
-
-    def client(self):
-        # if local file doesn't exists, try to fetch it
-        if not os.path.exists(self.file_path):
-            try:
-                stream = db.storage.binary.get("chromadb")
-                with open(".tmp/chroma/chroma.zip", "wb") as file:
-                    file.write(stream)
-                shutil.unpack_archive("chroma.zip", self.path)
-            except FileNotFoundError:
-                pass
-        # Instigate the client
-        the_client = chromadb.PersistentClient(self.path)
-        the_client.persist = self.persist
-
-        return the_client