Bump version & moved to uv

1pxone · 1pxone · commit f7d778db011e · 2025-06-30T08:57:18.000+07:00
diff --git a/.env.example b/.env.example
@@ -1,3 +1,3 @@
 # RushDB Configuration
-RUSHDB_TOKEN=your_api_token_here
+RUSHDB_API_KEY=your_api_token_here
 RUSHDB_URL=http://localhost:3000
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Python SDK CI/CD
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
   release:
     types: [published]
 
@@ -23,23 +23,21 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
         with:
-          version: 1.7.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
+          version: "latest"
 
       - name: Install dependencies
         run: |
-          poetry install --no-interaction --no-root
+          uv sync --dev
 
       - name: Run linters
         run: |
-          poetry run black . --check
-          poetry run isort . --check
-          poetry run ruff check .
-          poetry run mypy src/rushdb
+          uv run black . --check
+          uv run isort . --check
+          uv run ruff check .
+          uv run mypy src/rushdb
 
   publish:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -54,20 +52,18 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
         with:
-          version: 1.7.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
+          version: "latest"
 
       - name: Install dependencies
         run: |
-          poetry install --no-interaction --no-root
+          uv sync --dev
 
       - name: Build and publish
         env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
         run: |
-          poetry build
-          poetry publish
+          uv build
+          uv publish
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+# Dependencies
 node_modules
 dist
 *.log
@@ -15,4 +16,58 @@ coverage
 .rollup.cache
 cjs
 esm
-packages/javascript-sdk/types
+packages/javascript-sdk/types
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Virtual environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Testing
+.coverage
+.pytest_cache/
+.tox/
+htmlcov/
+.nox/
+
+# uv
+.uv/
+uv.lock
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,20 +43,39 @@ For urgent issues or further assistance, you can reach out directly:
 We appreciate your contributions and look forward to your feedback!
 
 --- 
-## Poetry commands
+## Development Commands
 
-```
-poetry run isort . --check
+```bash
+# Install dependencies
+uv sync --dev
 ```
 
+```bash
+# Check import sorting
+uv run isort . --check
 ```
-poetry run mypy src/rushdb
+
+```bash
+# Type checking
+uv run mypy src/rushdb
 ```
 
+```bash
+# Code formatting
+uv run black .
 ```
-poetry run black .
+
+```bash
+# Linting
+uv run ruff check .
 ```
 
+```bash
+# Run tests
+uv run pytest
 ```
-poetry run ruff check .
+
+```bash
+# Run tests with coverage
+uv run pytest --cov
 ```
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ pip install rushdb
 from rushdb import RushDB
 
 # Initialize the client
-db = RushDB("YOUR_API_TOKEN")
+db = RushDB("RUSHDB_API_KEY")
 
 # Create a record
 user = db.records.create(
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,14 +1,13 @@
-[tool.poetry]
+[project]
 name = "rushdb"
-version = "1.6.0"
+version = "1.8.0"
 description = "RushDB Python SDK"
-authors = ["RushDB Team <hi@rushdb.com>"]
-license = "Apache-2.0"
+authors = [
+    {name = "RushDB Team", email = "hi@rushdb.com"}
+]
+license = {text = "Apache-2.0"}
 readme = "README.md"
-homepage = "https://github.com/rush-db/rushdb-python"
-repository = "https://github.com/rush-db/rushdb-python"
-documentation = "https://docs.rushdb.com"
-packages = [{ include = "rushdb", from = "src" }]
+requires-python = ">=3.8"
 keywords = [
     "database",
     "graph database",
@@ -40,30 +39,39 @@ keywords = [
     "rush db",
     "rushdb"
 ]
+dependencies = [
+    "python-dotenv>=1.0.0",
+    "requests>=2.31.0"
+]
 
-[tool.poetry.dependencies]
-python = "^3.8"
-python-dotenv = "^1.0.0"
-requests = "^2.31.0"
+[project.urls]
+Homepage = "https://github.com/rush-db/rushdb-python"
+Repository = "https://github.com/rush-db/rushdb-python"
+Documentation = "https://docs.rushdb.com"
 
-[tool.poetry.dev-dependencies]
-black = "^23.7.0"
-isort = "^5.12.0"
-ruff = "^0.0.280"
-mypy = "^1.4.1"
-pytest = "^7.4.0"
-pytest-cov = "^4.1.0"
-types-requests = "^2.31.0.1"
-types-python-dateutil = "^2.8.19.14"
+[project.optional-dependencies]
+dev = [
+    "black>=23.7.0",
+    "isort>=5.12.0",
+    "ruff>=0.0.280",
+    "mypy>=1.4.1",
+    "pytest>=7.4.0",
+    "pytest-cov>=4.1.0",
+    "types-requests>=2.31.0.1",
+    "types-python-dateutil>=2.8.19.14"
+]
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/rushdb"]
 
 [tool.ruff]
 line-length = 120
 
 [tool.isort]
 profile = "black"
 multi_line_output = 3
-line_length = 120
+line_length = 120
diff --git a/src/rushdb/api/records.py b/src/rushdb/api/records.py
@@ -558,7 +558,7 @@ def _extract_target_ids(
             List[Dict[str, Any]],
             "Record",
             List["Record"],
-        ]
+        ],
     ) -> List[str]:
         """Extract record IDs from various input types and formats.
 
diff --git a/src/rushdb/client.py b/src/rushdb/client.py
@@ -178,7 +178,7 @@ def _make_request(
 
         # Prepare headers
         request_headers = {
-            "token": self.api_key,
+            "Authorization": f"Bearer {self.api_key}",
             "Content-Type": "application/json",
             **(headers or {}),
         }
diff --git a/src/rushdb/models/result.py b/src/rushdb/models/result.py
@@ -66,7 +66,7 @@ def skip(self) -> int:
     @property
     def limit(self) -> Optional[int]:
         """Get the limit that was applied to the search."""
-        return self._search_query.get("limit") or len(self.data)
+        return self._search_query.get("limit")
 
     def __len__(self) -> int:
         """Get the number of records in this result set."""
@@ -108,7 +108,7 @@ def get_page_info(self) -> dict:
             "loaded": len(self.data),
             "has_more": self.has_more,
             "skip": self.skip,
-            "limit": self.limit or len(self.data),
+            "limit": self.limit,
         }
 
 
diff --git a/tests/test_base_setup.py b/tests/test_base_setup.py
@@ -32,12 +32,12 @@ def setUpClass(cls):
         load_env()
 
         # Get configuration from environment variables
-        cls.token = os.getenv("RUSHDB_TOKEN")
+        cls.token = os.getenv("RUSHDB_API_KEY")
         cls.base_url = os.getenv("RUSHDB_URL")
 
         if not cls.token:
             raise ValueError(
-                "RUSHDB_TOKEN environment variable is not set. "
+                "RUSHDB_API_KEY environment variable is not set. "
                 "Please create a .env file with your credentials. "
                 "You can use .env.example as a template."
             )

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ def _make_request(`
`178`	`178`
`179`	`179`	`# Prepare headers`
`180`	`180`	`request_headers = {`
`181`		`- "token": self.api_key,`
	`181`	`+ "Authorization": f"Bearer {self.api_key}",`
`182`	`182`	`"Content-Type": "application/json",`
`183`	`183`	`**(headers or {}),`
`184`	`184`	`}`