Fix runff checks

Author: iam404

Makefile

@@ -53,7 +53,7 @@ lint:
 check:
 	$(VENV_PYTHON) -m ruff format --check .
 	$(VENV_PYTHON) -m ruff check .
-	$(VENV_PYTHON) -m mypy $(SRC_DIR)
+	$(VENV_PYTHON) -m pi $(SRC_DIR)
 
 type-check:
 	$(VENV_PYTHON) -m mypy $(SRC_DIR)

examples/ws_list.py

@@ -3,7 +3,7 @@
 
 def main():
     client = TFEClient(TFEConfig.from_env())
-    org = "prab-sandbox01"
+    org = "tfe-xxxxx"
     for ws in client.workspaces.list(org):
         print("WS:", ws.name, ws.id)
 

src/tfe/__init__.py

@@ -1,6 +1,5 @@
-from .config import TFEConfig
-from .client import TFEClient
-
 from . import errors
+from .client import TFEClient
+from .config import TFEConfig
 
 __all__ = ["TFEConfig", "TFEClient", "errors"]

src/tfe/_http.py

@@ -1,8 +1,20 @@
 from __future__ import annotations
-import httpx, time, anyio
-from typing import Any, Mapping
-from .errors import *
+
+import time
+from collections.abc import Mapping
+from typing import Any
+
+import anyio
+import httpx
+
 from ._jsonapi import build_headers, parse_error_payload
+from .errors import (
+    AuthError,
+    NotFound,
+    RateLimited,
+    ServerError,
+    TFEError,
+)
 
 _RETRY_STATUSES = {429, 502, 503, 504}
 
@@ -71,7 +83,7 @@ def request(
                 )
             except httpx.HTTPError as e:
                 if attempt >= self.max_retries:
-                    raise ServerError(str(e))
+                    raise ServerError(str(e)) from e
                 self._sleep(attempt, None)
                 attempt += 1
                 continue
@@ -109,7 +121,7 @@ async def arequest(
                 )
             except httpx.HTTPError as e:
                 if attempt >= self.max_retries:
-                    raise ServerError(str(e))
+                    raise ServerError(str(e)) from e
                 await self._asleep(attempt, None)
                 attempt += 1
                 continue

src/tfe/_jsonapi.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from typing import Any
 
 

src/tfe/aclient.py

@@ -3,9 +3,9 @@
 """
 
 from __future__ import annotations
-from .config import TFEConfig
+
 from ._http import HTTPTransport
-from .resources.admin.settings import AdminSettingsAsync
+from .config import TFEConfig
 
 
 class AsyncTFEClient:

src/tfe/client.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
-from .config import TFEConfig
+
 from ._http import HTTPTransport
+from .config import TFEConfig
 from .resources.organizations import Organizations
 from .resources.projects import Projects
 from .resources.workspaces import Workspaces
-from .resources.admin.settings import AdminSettings
 
 
 class TFEClient:

src/tfe/config.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
-from pydantic import BaseModel, Field
+
 import os
 
+from pydantic import BaseModel, Field
+
 
 class TFEConfig(BaseModel):
     address: str = Field(
@@ -24,5 +26,5 @@ class TFEConfig(BaseModel):
     ca_bundle: str | None = os.getenv("SSL_CERT_FILE", None)
 
     @classmethod
-    def from_env(cls) -> "TFEConfig":
+    def from_env(cls) -> TFEConfig:
         return cls()

src/tfe/errors.py

@@ -1,13 +1,13 @@
-from typing import Optional, List, Dict
+from __future__ import annotations
 
 
 class TFEError(Exception):
     def __init__(
         self,
         message: str,
         *,
-        status: Optional[int] = None,
-        errors: Optional[List[Dict]] = None,
+        status: int | None = None,
+        errors: list[dict] | None = None,
     ):
         super().__init__(message)
         self.status = status
@@ -21,7 +21,7 @@ class NotFound(TFEError): ...
 
 
 class RateLimited(TFEError):
-    def __init__(self, message: str, *, retry_after: Optional[float] = None, **kw):
+    def __init__(self, message: str, *, retry_after: float | None = None, **kw):
         super().__init__(message, **kw)
         self.retry_after = retry_after
 

src/tfe/resources/_base.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Iterator, AsyncIterator
+
 from .._http import HTTPTransport
 
 
@@ -15,8 +15,7 @@ def _list(self, path: str, *, params: dict | None = None):
             p.setdefault("page[size]", 100)
             r = self.t.request("GET", path, params=p)
             data = r.json().get("data", [])
-            for item in data:
-                yield item
+            yield from data
             if len(data) < p["page[size]"]:
                 break
             page += 1