feat(api): api update

.stats.yml

@@ -1,2 +1,2 @@
 configured_endpoints: 68
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/datamini%2Fasktable-70caff6d751e62dc360c72766ea91a07da36288a58a83a412fd64d1e8ca0aa2a.yml
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/datamini%2Fasktable-352b207b595dae80ace064f5b2754553010f90bbf748e6e3736324cd879341bf.yml

pyproject.toml

@@ -63,11 +63,11 @@ format = { chain = [
   "format:ruff",
   "format:docs",
   "fix:ruff",
+  # run formatting again to fix any inconsistencies when imports are stripped
+  "format:ruff",
 ]}
-"format:black" = "black ."
 "format:docs" = "python scripts/utils/ruffen-docs.py README.md api.md"
 "format:ruff" = "ruff format"
-"format:isort" = "isort ."
 
 "lint" = { chain = [
   "check:ruff",
@@ -125,10 +125,6 @@ path = "README.md"
 pattern = '\[(.+?)\]\(((?!https?://)\S+?)\)'
 replacement = '[\1](https://github.com/DataMini/asktable-python/tree/main/\g<2>)'
 
-[tool.black]
-line-length = 120
-target-version = ["py37"]
-
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = "--tb=short"

requirements-dev.lock

@@ -80,7 +80,7 @@ pytz==2023.3.post1
     # via dirty-equals
 respx==0.20.2
 rich==13.7.1
-ruff==0.6.5
+ruff==0.6.9
 setuptools==68.2.2
     # via nodeenv
 six==1.16.0

src/asktable/_base_client.py

@@ -1575,7 +1575,7 @@ async def _request(
         except Exception as err:
             log.debug("Encountered Exception", exc_info=True)
 
-            if retries_taken > 0:
+            if remaining_retries > 0:
                 return await self._retry_request(
                     input_options,
                     cast_to,

src/asktable/resources/datasources/datasources.py

@@ -182,7 +182,8 @@ def update(
         access_config: Optional[datasource_update_params.AccessConfig] | NotGiven = NOT_GIVEN,
         field_count: Optional[int] | NotGiven = NOT_GIVEN,
         meta_error: Optional[str] | NotGiven = NOT_GIVEN,
-        meta_status: Optional[Literal["processing", "failed", "success", "unprocessed"]] | NotGiven = NOT_GIVEN,
+        meta_status: Optional[Literal["processing", "failed", "warning", "success", "unprocessed"]]
+        | NotGiven = NOT_GIVEN,
         name: Optional[str] | NotGiven = NOT_GIVEN,
         sample_questions: Optional[str] | NotGiven = NOT_GIVEN,
         schema_count: Optional[int] | NotGiven = NOT_GIVEN,
@@ -515,7 +516,8 @@ async def update(
         access_config: Optional[datasource_update_params.AccessConfig] | NotGiven = NOT_GIVEN,
         field_count: Optional[int] | NotGiven = NOT_GIVEN,
         meta_error: Optional[str] | NotGiven = NOT_GIVEN,
-        meta_status: Optional[Literal["processing", "failed", "success", "unprocessed"]] | NotGiven = NOT_GIVEN,
+        meta_status: Optional[Literal["processing", "failed", "warning", "success", "unprocessed"]]
+        | NotGiven = NOT_GIVEN,
         name: Optional[str] | NotGiven = NOT_GIVEN,
         sample_questions: Optional[str] | NotGiven = NOT_GIVEN,
         schema_count: Optional[int] | NotGiven = NOT_GIVEN,

src/asktable/types/answer_data_source_out.py

@@ -1,7 +1,6 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 
-
 from .._models import BaseModel
 from .data_source import DataSource
 from .shared.answer_model import AnswerModel

src/asktable/types/data_source.py

@@ -44,7 +44,7 @@ class DataSource(BaseModel):
     engine: Literal["mysql", "tidb", "postgresql", "oceanbase", "clickhouse", "csv", "excel"]
     """数据源引擎"""
 
-    meta_status: Literal["processing", "failed", "success", "unprocessed"]
+    meta_status: Literal["processing", "failed", "warning", "success", "unprocessed"]
     """元数据处理状态"""
 
     project_id: str

src/asktable/types/datasource_update_params.py

@@ -18,7 +18,7 @@ class DatasourceUpdateParams(TypedDict, total=False):
     meta_error: Optional[str]
     """元数据处理错误"""
 
-    meta_status: Optional[Literal["processing", "failed", "success", "unprocessed"]]
+    meta_status: Optional[Literal["processing", "failed", "warning", "success", "unprocessed"]]
     """元数据处理状态"""
 
     name: Optional[str]

tests/test_client.py

@@ -10,6 +10,7 @@
 import tracemalloc
 from typing import Any, Union, cast
 from unittest import mock
+from typing_extensions import Literal
 
 import httpx
 import pytest
@@ -727,7 +728,14 @@ def test_retrying_status_errors_doesnt_leak(self, respx_mock: MockRouter) -> Non
     @pytest.mark.parametrize("failures_before_success", [0, 2, 4])
     @mock.patch("asktable._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
     @pytest.mark.respx(base_url=base_url)
-    def test_retries_taken(self, client: Asktable, failures_before_success: int, respx_mock: MockRouter) -> None:
+    @pytest.mark.parametrize("failure_mode", ["status", "exception"])
+    def test_retries_taken(
+        self,
+        client: Asktable,
+        failures_before_success: int,
+        failure_mode: Literal["status", "exception"],
+        respx_mock: MockRouter,
+    ) -> None:
         client = client.with_options(max_retries=4)
 
         nb_retries = 0
@@ -736,6 +744,8 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
             nonlocal nb_retries
             if nb_retries < failures_before_success:
                 nb_retries += 1
+                if failure_mode == "exception":
+                    raise RuntimeError("oops")
                 return httpx.Response(500)
             return httpx.Response(200)
 
@@ -1489,8 +1499,13 @@ async def test_retrying_status_errors_doesnt_leak(self, respx_mock: MockRouter)
     @mock.patch("asktable._base_client.BaseClient._calculate_retry_timeout", _low_retry_timeout)
     @pytest.mark.respx(base_url=base_url)
     @pytest.mark.asyncio
+    @pytest.mark.parametrize("failure_mode", ["status", "exception"])
     async def test_retries_taken(
-        self, async_client: AsyncAsktable, failures_before_success: int, respx_mock: MockRouter
+        self,
+        async_client: AsyncAsktable,
+        failures_before_success: int,
+        failure_mode: Literal["status", "exception"],
+        respx_mock: MockRouter,
     ) -> None:
         client = async_client.with_options(max_retries=4)
 
@@ -1500,6 +1515,8 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
             nonlocal nb_retries
             if nb_retries < failures_before_success:
                 nb_retries += 1
+                if failure_mode == "exception":
+                    raise RuntimeError("oops")
                 return httpx.Response(500)
             return httpx.Response(200)
 

tests/test_models.py

@@ -245,7 +245,7 @@ class Model(BaseModel):
     assert m.foo is True
 
     m = Model.construct(foo="CARD_HOLDER")
-    assert m.foo is "CARD_HOLDER"
+    assert m.foo == "CARD_HOLDER"
 
     m = Model.construct(foo={"bar": False})
     assert isinstance(m.foo, Submodel1)