defistream 1.3.0__tar.gz → 1.4.1__tar.gz

{defistream-1.3.0 → defistream-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: defistream
-Version: 1.3.0
+Version: 1.4.1
 Summary: Python client for the DeFiStream API
 Project-URL: Homepage, https://defistream.dev
 Project-URL: Documentation, https://docs.defistream.dev
@@ -337,6 +337,35 @@ df = (
 )
 ```
 
+### Price Enrichment
+
+Use `.with_price()` to enrich events with USD price data. This adds `price` (unit price) and `value_usd` (amount × price) columns to individual events. On aggregate endpoints, it produces an `agg_value_usd` (sum) column.
+
+Supported protocols: AAVE, Uniswap, Lido, Stader, ERC20, Native Token.
+
+```python
+# Individual events with price data
+df = (
+    client.aave.deposits()
+    .network("ETH")
+    .block_range(21000000, 21010000)
+    .with_price()
+    .as_df()
+)
+# df now includes 'price' and 'value_usd' columns
+
+# Aggregate with price — adds agg_value_usd column
+df = (
+    client.aave.deposits()
+    .network("ETH")
+    .block_range(21000000, 21100000)
+    .with_price()
+    .aggregate(group_by="time", period="2h")
+    .as_df()
+)
+# df now includes 'agg_value_usd' column
+```
+
 ### Return as DataFrame
 
 ```python
@@ -541,6 +570,7 @@ print(f"Request cost: {client.last_response.request_cost}")
 | `.end_time(ts)` | Set ending time (ISO format or Unix timestamp) |
 | `.time_range(start, end)` | Set both start and end times |
 | `.verbose()` | Include all metadata fields |
+| `.with_price()` | Enrich events with USD price data (`price` and `value_usd` columns) |
 
 ### Protocol-Specific Parameters
 

{defistream-1.3.0 → defistream-1.4.1}/README.md

@@ -303,6 +303,35 @@ df = (
 )
 ```
 
+### Price Enrichment
+
+Use `.with_price()` to enrich events with USD price data. This adds `price` (unit price) and `value_usd` (amount × price) columns to individual events. On aggregate endpoints, it produces an `agg_value_usd` (sum) column.
+
+Supported protocols: AAVE, Uniswap, Lido, Stader, ERC20, Native Token.
+
+```python
+# Individual events with price data
+df = (
+    client.aave.deposits()
+    .network("ETH")
+    .block_range(21000000, 21010000)
+    .with_price()
+    .as_df()
+)
+# df now includes 'price' and 'value_usd' columns
+
+# Aggregate with price — adds agg_value_usd column
+df = (
+    client.aave.deposits()
+    .network("ETH")
+    .block_range(21000000, 21100000)
+    .with_price()
+    .aggregate(group_by="time", period="2h")
+    .as_df()
+)
+# df now includes 'agg_value_usd' column
+```
+
 ### Return as DataFrame
 
 ```python
@@ -507,6 +536,7 @@ print(f"Request cost: {client.last_response.request_cost}")
 | `.end_time(ts)` | Set ending time (ISO format or Unix timestamp) |
 | `.time_range(start, end)` | Set both start and end times |
 | `.verbose()` | Include all metadata fields |
+| `.with_price()` | Enrich events with USD price data (`price` and `value_usd` columns) |
 
 ### Protocol-Specific Parameters
 

{defistream-1.3.0 → defistream-1.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "defistream"
-version = "1.3.0"
+version = "1.4.1"
 description = "Python client for the DeFiStream API"
 readme = "README.md"
 license = "MIT"
@@ -48,6 +48,9 @@ Repository = "https://github.com/Eren-Nevin/DeFiStream_PythonClient"
 [tool.hatch.build.targets.wheel]
 packages = ["src/defistream"]
 
+[tool.hatch.build.targets.sdist]
+exclude = [".claude/", "tests/", ".env"]
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 testpaths = ["tests"]

{defistream-1.3.0 → defistream-1.4.1}/src/defistream/__init__.py

@@ -36,7 +36,7 @@ from .query import (
     QueryBuilder,
 )
 
-__version__ = "1.3.0"
+__version__ = "1.4.1"
 
 __all__ = [
     # Clients

{defistream-1.3.0 → defistream-1.4.1}/src/defistream/query.py

@@ -109,14 +109,18 @@ class QueryBuilder:
         self._endpoint = endpoint
         self._params: dict[str, Any] = initial_params or {}
         self._verbose = False
+        self._with_price = False
 
     def _copy_with(self, **updates: Any) -> "QueryBuilder":
         """Create a copy with updated parameters."""
         new_builder = QueryBuilder(self._client, self._endpoint, self._params.copy())
         new_builder._verbose = self._verbose
+        new_builder._with_price = self._with_price
         for key, value in updates.items():
             if key == "verbose":
                 new_builder._verbose = value
+            elif key == "with_price":
+                new_builder._with_price = value
             elif value is not None:
                 new_builder._params[key] = value
         return new_builder
@@ -232,6 +236,11 @@ class QueryBuilder:
         """Include all metadata fields (tx_hash, tx_id, log_index, network, name)."""
         return self._copy_with(verbose=enabled)
 
+    # Price enrichment
+    def with_price(self, enabled: bool = True) -> "QueryBuilder":
+        """Enrich events with USD price data (adds ``price`` and ``value_usd`` columns)."""
+        return self._copy_with(with_price=enabled)
+
     # Build final params
     def _build_params(self) -> dict[str, Any]:
         """Build the final query parameters."""
@@ -240,6 +249,8 @@ class QueryBuilder:
         _validate_mutual_exclusivity(params)
         if self._verbose:
             params["verbose"] = "true"
+        if self._with_price:
+            params["with_price"] = "true"
         return params
 
     # Terminal methods - execute the query
@@ -345,6 +356,7 @@ class QueryBuilder:
             self._params.copy(),
         )
         builder._verbose = self._verbose
+        builder._with_price = self._with_price
         builder._params["group_by"] = group_by
         builder._params["period"] = period
         return builder
@@ -365,9 +377,12 @@ class AggregateQueryBuilder(QueryBuilder):
         """Create a copy preserving aggregate builder type."""
         new_builder = AggregateQueryBuilder(self._client, self._endpoint, self._params.copy())
         new_builder._verbose = self._verbose
+        new_builder._with_price = self._with_price
         for key, value in updates.items():
             if key == "verbose":
                 new_builder._verbose = value
+            elif key == "with_price":
+                new_builder._with_price = value
             elif value is not None:
                 new_builder._params[key] = value
         return new_builder
@@ -449,14 +464,18 @@ class AsyncQueryBuilder:
         self._endpoint = endpoint
         self._params: dict[str, Any] = initial_params or {}
         self._verbose = False
+        self._with_price = False
 
     def _copy_with(self, **updates: Any) -> "AsyncQueryBuilder":
         """Create a copy with updated parameters."""
         new_builder = AsyncQueryBuilder(self._client, self._endpoint, self._params.copy())
         new_builder._verbose = self._verbose
+        new_builder._with_price = self._with_price
         for key, value in updates.items():
             if key == "verbose":
                 new_builder._verbose = value
+            elif key == "with_price":
+                new_builder._with_price = value
             elif value is not None:
                 new_builder._params[key] = value
         return new_builder
@@ -572,6 +591,11 @@ class AsyncQueryBuilder:
         """Include all metadata fields (tx_hash, tx_id, log_index, network, name)."""
         return self._copy_with(verbose=enabled)
 
+    # Price enrichment
+    def with_price(self, enabled: bool = True) -> "AsyncQueryBuilder":
+        """Enrich events with USD price data (adds ``price`` and ``value_usd`` columns)."""
+        return self._copy_with(with_price=enabled)
+
     # Build final params
     def _build_params(self) -> dict[str, Any]:
         """Build the final query parameters."""
@@ -580,6 +604,8 @@ class AsyncQueryBuilder:
         _validate_mutual_exclusivity(params)
         if self._verbose:
             params["verbose"] = "true"
+        if self._with_price:
+            params["with_price"] = "true"
         return params
 
     # Terminal methods - execute the query (async)
@@ -685,6 +711,7 @@ class AsyncQueryBuilder:
             self._params.copy(),
         )
         builder._verbose = self._verbose
+        builder._with_price = self._with_price
         builder._params["group_by"] = group_by
         builder._params["period"] = period
         return builder
@@ -705,9 +732,12 @@ class AsyncAggregateQueryBuilder(AsyncQueryBuilder):
         """Create a copy preserving async aggregate builder type."""
         new_builder = AsyncAggregateQueryBuilder(self._client, self._endpoint, self._params.copy())
         new_builder._verbose = self._verbose
+        new_builder._with_price = self._with_price
         for key, value in updates.items():
             if key == "verbose":
                 new_builder._verbose = value
+            elif key == "with_price":
+                new_builder._with_price = value
             elif value is not None:
                 new_builder._params[key] = value
         return new_builder

defistream-1.3.0/.claude/settings.local.json

@@ -1,34 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(git log:*)",
-      "Bash(python -m pytest:*)",
-      "Bash(python3 -m pytest:*)",
-      "Bash(git add:*)",
-      "Bash(git commit -m \"$\\(cat <<''EOF''\nAdd label/category filters and multi-value support to query builders\n\nAdd involving, involving_label, involving_category, sender_label,\nsender_category, receiver_label, receiver_category methods to both\nQueryBuilder and AsyncQueryBuilder. Update sender/receiver/from_address/\nto_address to accept varargs for multi-value filtering. Add SQL safety\nvalidation for label/category params and mutual exclusivity enforcement\nbetween involving* and sender*/receiver* filter slots.\n\nCo-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>\nEOF\n\\)\")",
-      "Bash(python3 -m build:*)",
-      "Bash(python3:*)",
-      "Bash(pip3 install:*)",
-      "Bash(/home/mvp/Running/Horatio_Chain_Scan/DeFiStream/python-client/.venv/bin/pip install:*)",
-      "Bash(/home/mvp/Running/Horatio_Chain_Scan/DeFiStream/python-client/.venv/bin/python:*)",
-      "Bash(source:*)",
-      "Bash(TWINE_USERNAME=__token__ TWINE_PASSWORD=\"$PYPI_PASSWORD\" /home/mvp/Running/Horatio_Chain_Scan/DeFiStream/python-client/.venv/bin/python:*)",
-      "Bash(git commit -m \"$\\(cat <<''EOF''\nBump python-client version to 1.1.0\n\nCo-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>\nEOF\n\\)\")",
-      "Bash(git push:*)",
-      "Bash(git subtree push:*)",
-      "Bash(.venv/bin/python -m pytest:*)",
-      "Bash(.venv/bin/python:*)",
-      "Bash(git status:*)",
-      "Bash(grep:*)",
-      "Bash(git commit -m \"$\\(cat <<''EOF''\nAccept case-insensitive network names in events server\n\nNormalize the network query parameter to uppercase at the entry point\nin both _fetch_events_dataframe and _handle_parquet_request so that\neth, Eth, and ETH are all accepted. Add tests for core and API gateway.\nUpdate API docs to note case-insensitivity.\n\nCo-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>\nEOF\n\\)\")",
-      "Bash(git commit:*)",
-      "Bash(curl:*)",
-      "Bash(tree:*)",
-      "Bash(python -m build:*)"
-    ]
-  },
-  "enableAllProjectMcpServers": true,
-  "enabledMcpjsonServers": [
-    "defistream"
-  ]
-}

defistream-1.3.0/tests/conftest.py

@@ -1,117 +0,0 @@
-"""
-Shared fixtures for DeFiStream python-client integration tests.
-
-Mirrors the API test suite conftest at api/tests/api-gateway/decoders/conftest.py,
-adapted for the python-client's builder-pattern interface.
-
-Run with:
-    python -m pytest tests/test_integration.py -v
-    python -m pytest tests/test_integration.py -v --local   # local dev gateway
-"""
-
-import os
-import sys
-from pathlib import Path
-
-import pytest
-
-from defistream import AsyncDeFiStream, DeFiStream
-
-# ---------------------------------------------------------------------------
-# --local flag support
-# ---------------------------------------------------------------------------
-
-_local_mode = "--local" in sys.argv
-
-_PRODUCTION_URL = "https://api.defistream.dev/v1"
-_LOCAL_URL = "http://localhost:8081/v1"
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--local",
-        action="store_true",
-        default=False,
-        help="Test against local dev gateway (http://localhost:8081/v1) instead of production",
-    )
-
-
-# ---------------------------------------------------------------------------
-# .env loading
-# ---------------------------------------------------------------------------
-
-def _load_env_file(path: Path) -> dict[str, str]:
-    if not path.exists():
-        return {}
-    env: dict[str, str] = {}
-    for line in path.read_text(encoding="utf-8").splitlines():
-        line = line.strip()
-        if not line or line.startswith("#") or "=" not in line:
-            continue
-        key, value = line.split("=", 1)
-        key = key.strip()
-        value = value.strip()
-        if (value.startswith('"') and value.endswith('"')) or (
-            value.startswith("'") and value.endswith("'")
-        ):
-            value = value[1:-1]
-        env[key] = value
-    return env
-
-
-def _get_env() -> dict[str, str]:
-    env = dict(os.environ)
-    project_root = Path(__file__).resolve().parents[1]  # python-client/
-    repo_root = project_root.parent                      # DeFiStream/
-    for candidate in [project_root / ".env", repo_root / ".env"]:
-        for key, value in _load_env_file(candidate).items():
-            if key not in env:
-                env[key] = value
-    return env
-
-
-_env = _get_env()
-
-# ---------------------------------------------------------------------------
-# Resolved configuration
-# ---------------------------------------------------------------------------
-
-API_BASE_URL = _LOCAL_URL if _local_mode else _env.get("API_BASE_URL", _PRODUCTION_URL).rstrip("/")
-TEST_API_KEY = _env.get("TEST_API_KEY", "")
-
-# ---------------------------------------------------------------------------
-# Auto-skip integration tests when API key is missing
-# ---------------------------------------------------------------------------
-
-_skip_no_key = pytest.mark.skipif(
-    not TEST_API_KEY,
-    reason="TEST_API_KEY not set in environment or .env",
-)
-
-
-def pytest_collection_modifyitems(config, items):
-    """Skip integration tests automatically when TEST_API_KEY is absent."""
-    for item in items:
-        if "test_integration" in str(item.fspath):
-            item.add_marker(_skip_no_key)
-
-
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(scope="module")
-def client():
-    """Sync DeFiStream client shared across a test module."""
-    c = DeFiStream(api_key=TEST_API_KEY, base_url=API_BASE_URL)
-    yield c
-    c.close()
-
-
-@pytest.fixture
-async def async_client():
-    """Async DeFiStream client — function-scoped for a clean event loop."""
-    c = AsyncDeFiStream(api_key=TEST_API_KEY, base_url=API_BASE_URL)
-    yield c
-    await c.close()