databar 2.0.0__tar.gz → 2.0.1__tar.gz

{databar-2.0.0/src/databar.egg-info → databar-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databar
-Version: 2.0.0
+Version: 2.0.1
 Summary: Official Databar.ai Python SDK and CLI — connect to enrichments, waterfalls, and tables via api.databar.ai
 Author-email: "Databar.ai Team" <info@databar.ai>
 License: MIT License
@@ -139,7 +139,7 @@ for param in enrichment.params:
 
 # Run single enrichment (async — returns task)
 task = client.run_enrichment(123, {"email": "alice@example.com"})
-data = client.poll_task(task.request_id)
+data = client.poll_task(task.task_id)
 
 # Run single enrichment (sync convenience wrapper)
 data = client.run_enrichment_sync(123, {"email": "alice@example.com"})

{databar-2.0.0 → databar-2.0.1}/README.md

@@ -84,7 +84,7 @@ for param in enrichment.params:
 
 # Run single enrichment (async — returns task)
 task = client.run_enrichment(123, {"email": "alice@example.com"})
-data = client.poll_task(task.request_id)
+data = client.poll_task(task.task_id)
 
 # Run single enrichment (sync convenience wrapper)
 data = client.run_enrichment_sync(123, {"email": "alice@example.com"})

{databar-2.0.0 → databar-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "databar"
-version = "2.0.0"
+version = "2.0.1"
 description = "Official Databar.ai Python SDK and CLI — connect to enrichments, waterfalls, and tables via api.databar.ai"
 readme = "README.md"
 license = { file = "LICENSE" }

{databar-2.0.0 → databar-2.0.1}/src/databar/__init__.py

@@ -45,6 +45,7 @@ from .models import (
     EnrichmentSummary,
     InsertOptions,
     InsertRow,
+    RunResponse,
     Table,
     TableEnrichment,
     TaskResponse,
@@ -56,7 +57,7 @@ from .models import (
     WaterfallEnrichment,
 )
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 __all__ = [
     "DatabarClient",
     # exceptions
@@ -78,6 +79,7 @@ __all__ = [
     "ChoiceItem",
     "Choices",
     "ChoicesResponse",
+    "RunResponse",
     "TaskResponse",
     "TaskStatus",
     "Waterfall",

{databar-2.0.0 → databar-2.0.1}/src/databar/client.py

@@ -42,6 +42,7 @@ from .models import (
     EnrichmentSummary,
     InsertOptions,
     InsertRow,
+    RunResponse,
     Table,
     TableEnrichment,
     TaskResponse,
@@ -270,31 +271,31 @@ class DatabarClient:
         data = self._request("GET", f"/enrichments/{enrichment_id}")
         return Enrichment.model_validate(data)
 
-    def run_enrichment(self, enrichment_id: int, params: Dict[str, Any]) -> TaskResponse:
+    def run_enrichment(self, enrichment_id: int, params: Dict[str, Any]) -> RunResponse:
         """Submit an enrichment run. Returns a task — use poll_task() or run_enrichment_sync()."""
         data = self._request("POST", f"/enrichments/{enrichment_id}/run", json={"params": params})
-        return TaskResponse.model_validate(data)
+        return RunResponse.model_validate(data)
 
     def run_enrichment_bulk(
         self, enrichment_id: int, params: List[Dict[str, Any]]
-    ) -> TaskResponse:
+    ) -> RunResponse:
         """Submit a bulk enrichment run for multiple inputs."""
         data = self._request("POST", f"/enrichments/{enrichment_id}/bulk-run", json={"params": params})
-        return TaskResponse.model_validate(data)
+        return RunResponse.model_validate(data)
 
     def run_enrichment_sync(
         self, enrichment_id: int, params: Dict[str, Any]
     ) -> Any:
         """Submit and poll an enrichment, returning final data when complete."""
         task = self.run_enrichment(enrichment_id, params)
-        return self.poll_task(task.request_id)
+        return self.poll_task(task.task_id)
 
     def run_enrichment_bulk_sync(
         self, enrichment_id: int, params: List[Dict[str, Any]]
     ) -> Any:
         """Submit and poll a bulk enrichment, returning final data when complete."""
         task = self.run_enrichment_bulk(enrichment_id, params)
-        return self.poll_task(task.request_id)
+        return self.poll_task(task.task_id)
 
     def get_param_choices(
         self,
@@ -335,7 +336,7 @@ class DatabarClient:
         params: Dict[str, Any],
         enrichments: Optional[List[int]] = None,
         email_verifier: Optional[int] = None,
-    ) -> TaskResponse:
+    ) -> RunResponse:
         """
         Submit a waterfall run.
 
@@ -351,7 +352,7 @@ class DatabarClient:
             payload["email_verifier"] = email_verifier
 
         data = self._request("POST", f"/waterfalls/{identifier}/run", json=payload)
-        return TaskResponse.model_validate(data)
+        return RunResponse.model_validate(data)
 
     def run_waterfall_bulk(
         self,
@@ -359,7 +360,7 @@ class DatabarClient:
         params: List[Dict[str, Any]],
         enrichments: Optional[List[int]] = None,
         email_verifier: Optional[int] = None,
-    ) -> TaskResponse:
+    ) -> RunResponse:
         """Submit a bulk waterfall run for multiple inputs."""
         if not enrichments:
             waterfall = self.get_waterfall(identifier)
@@ -370,7 +371,7 @@ class DatabarClient:
             payload["email_verifier"] = email_verifier
 
         data = self._request("POST", f"/waterfalls/{identifier}/bulk-run", json=payload)
-        return TaskResponse.model_validate(data)
+        return RunResponse.model_validate(data)
 
     def run_waterfall_sync(
         self,
@@ -381,7 +382,7 @@ class DatabarClient:
     ) -> Any:
         """Submit and poll a waterfall, returning final data when complete."""
         task = self.run_waterfall(identifier, params, enrichments, email_verifier)
-        return self.poll_task(task.request_id)
+        return self.poll_task(task.task_id)
 
     def run_waterfall_bulk_sync(
         self,
@@ -392,7 +393,7 @@ class DatabarClient:
     ) -> Any:
         """Submit and poll a bulk waterfall, returning final data when complete."""
         task = self.run_waterfall_bulk(identifier, params, enrichments, email_verifier)
-        return self.poll_task(task.request_id)
+        return self.poll_task(task.task_id)
 
     # -----------------------------------------------------------------------
     # Tables

{databar-2.0.0 → databar-2.0.1}/src/databar/models.py

@@ -104,8 +104,24 @@ class TaskStatus(str, Enum):
     GONE = "gone"
 
 
+class RunResponse(BaseModel):
+    """Returned by all /run and /bulk-run endpoints. Contains the task_id to poll."""
+
+    task_id: str = Field(description="Unique identifier of the submitted task.")
+    status: str = Field(default="processing")
+
+
 class TaskResponse(BaseModel):
-    request_id: str = Field(description="Unique identifier of the request.")
+    """Returned by GET /v1/tasks/{task_id}.
+
+    The backend currently uses 'request_id' as the field name; this model
+    accepts both 'task_id' and 'request_id' so it works before and after
+    the backend renames the field.
+    """
+
+    task_id: str = Field(
+        description="Unique identifier of the task.",
+    )
     status: str = Field(
         description="Current status: processing, completed, failed, or gone."
     )
@@ -114,6 +130,13 @@ class TaskResponse(BaseModel):
         description="Resulting data once completed.",
     )
     error: Optional[Union[str, List[str]]] = None
+    credits_spent: float = 0
+
+    @classmethod
+    def model_validate(cls, obj: Any, **kwargs: Any) -> "TaskResponse":
+        if isinstance(obj, dict) and "task_id" not in obj and "request_id" in obj:
+            obj = {**obj, "task_id": obj["request_id"]}
+        return super().model_validate(obj, **kwargs)
 
 
 # ===========================================================================

{databar-2.0.0 → databar-2.0.1/src/databar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databar
-Version: 2.0.0
+Version: 2.0.1
 Summary: Official Databar.ai Python SDK and CLI — connect to enrichments, waterfalls, and tables via api.databar.ai
 Author-email: "Databar.ai Team" <info@databar.ai>
 License: MIT License
@@ -139,7 +139,7 @@ for param in enrichment.params:
 
 # Run single enrichment (async — returns task)
 task = client.run_enrichment(123, {"email": "alice@example.com"})
-data = client.poll_task(task.request_id)
+data = client.poll_task(task.task_id)
 
 # Run single enrichment (sync convenience wrapper)
 data = client.run_enrichment_sync(123, {"email": "alice@example.com"})

{databar-2.0.0 → databar-2.0.1}/tests/test_cli.py

@@ -110,7 +110,7 @@ def _client_mock(**method_overrides):
     m.get_table_enrichments.return_value = [TableEnrichment(id=5, name="My Enrichment")]
     m.add_enrichment.return_value = {"status": "ok"}
     m.run_table_enrichment.return_value = {"status": "triggered"}
-    m.get_task.return_value = TaskResponse(request_id="t1", status="completed", data={"result": "ok"})
+    m.get_task.return_value = TaskResponse(task_id="t1", status="completed", data={"result": "ok"})
     m.poll_task.return_value = {"result": "ok"}
 
     for method, return_value in method_overrides.items():
@@ -329,4 +329,4 @@ def test_task_get_poll(monkeypatch):
 def test_version_flag():
     result = runner.invoke(app, ["--version"])
     assert result.exit_code == 0
-    assert "2.0.0" in result.output
+    assert "2.0.1" in result.output

{databar-2.0.0 → databar-2.0.1}/tests/test_client.py

@@ -29,6 +29,7 @@ from databar.models import (
     BatchUpdateResponse,
     BatchUpdateRow,
     InsertRow,
+    RunResponse,
     UpsertResponse,
     UpsertRow,
 )
@@ -150,7 +151,7 @@ def test_get_enrichment(client: DatabarClient, httpx_mock: HTTPXMock):
 def test_run_enrichment_returns_task(client: DatabarClient, httpx_mock: HTTPXMock):
     httpx_mock.add_response(url=f"{BASE_URL}/enrichments/1/run", json=task_payload("processing"))
     task = client.run_enrichment(1, {"email": "test@example.com"})
-    assert task.request_id == "task-123"
+    assert task.task_id == "task-123"
     assert task.status == "processing"
 
 
@@ -163,7 +164,7 @@ def test_run_enrichment_sync(client: DatabarClient, httpx_mock: HTTPXMock):
 
 def test_run_enrichment_sync_failed(client: DatabarClient, httpx_mock: HTTPXMock):
     httpx_mock.add_response(url=f"{BASE_URL}/enrichments/1/run", json=task_payload("processing"))
-    httpx_mock.add_response(url=f"{BASE_URL}/tasks/task-123", json={"request_id": "task-123", "status": "failed", "data": None, "error": "upstream error"})
+    httpx_mock.add_response(url=f"{BASE_URL}/tasks/task-123", json={"task_id": "task-123", "status": "failed", "data": None, "error": "upstream error"})
     with pytest.raises(DatabarTaskFailedError, match="upstream error"):
         client.run_enrichment_sync(1, {"email": "test@example.com"})
 
@@ -193,7 +194,7 @@ def test_run_waterfall_auto_resolves_providers(client: DatabarClient, httpx_mock
     httpx_mock.add_response(url=f"{BASE_URL}/waterfalls/email_getter", json=waterfall_payload())
     httpx_mock.add_response(url=f"{BASE_URL}/waterfalls/email_getter/run", json=task_payload("processing"))
     task = client.run_waterfall("email_getter", {"linkedin_url": "https://linkedin.com/in/alice"})
-    assert task.request_id == "task-123"
+    assert task.task_id == "task-123"
     req = httpx_mock.get_requests()[-1]
     body = json.loads(req.content)
     assert body["enrichments"] == [10, 11]