Fixes

Author: caballeto

src/devhelm/_http.py

@@ -35,12 +35,16 @@ def _resolve(value: str | None, env_key: str, label: str) -> str:
     return result
 
 
+def _resolve_optional(value: str | None, env_key: str, default: str) -> str:
+    return value or os.environ.get(env_key) or default
+
+
 def build_client(config: DevhelmConfig) -> httpx.Client:
     """Create a configured httpx.Client with auth and tenant headers."""
     base_url = config.base_url.rstrip("/")
     token = _resolve(config.token, "DEVHELM_API_TOKEN", "token")
-    org_id = _resolve(config.org_id, "DEVHELM_ORG_ID", "org_id")
-    workspace_id = _resolve(config.workspace_id, "DEVHELM_WORKSPACE_ID", "workspace_id")
+    org_id = _resolve_optional(config.org_id, "DEVHELM_ORG_ID", "1")
+    workspace_id = _resolve_optional(config.workspace_id, "DEVHELM_WORKSPACE_ID", "1")
 
     return httpx.Client(
         base_url=base_url,

src/devhelm/client.py

@@ -25,7 +25,7 @@ class Devhelm:
 
         from devhelm import Devhelm
 
-        client = Devhelm(token="your-api-token", org_id="1", workspace_id="1")
+        client = Devhelm(token="your-api-token")
 
         monitors = client.monitors.list()
         monitor = client.monitors.create({

tests/test_client.py

@@ -21,9 +21,7 @@
 
 
 @pytest.fixture
-def client(monkeypatch: pytest.MonkeyPatch) -> Devhelm:
-    monkeypatch.setenv("DEVHELM_ORG_ID", "1")
-    monkeypatch.setenv("DEVHELM_WORKSPACE_ID", "1")
+def client() -> Devhelm:
     return Devhelm(token="test-token", base_url="http://localhost:8080")
 
 

tests/test_http.py

@@ -4,7 +4,6 @@
 
 import pytest
 
-from devhelm._errors import DevhelmError
 from devhelm._http import DevhelmConfig, build_client, path_param, unwrap_single
 
 
@@ -41,18 +40,14 @@ def test_encodes_special_chars(self) -> None:
 
 
 class TestBuildClient:
-    def test_requires_org_id(self, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_defaults_org_and_workspace(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.delenv("DEVHELM_ORG_ID", raising=False)
         monkeypatch.delenv("DEVHELM_WORKSPACE_ID", raising=False)
         config = DevhelmConfig(token="test-token")
-        with pytest.raises(DevhelmError, match="org_id is required"):
-            build_client(config)
-
-    def test_requires_workspace_id(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.delenv("DEVHELM_WORKSPACE_ID", raising=False)
-        config = DevhelmConfig(token="test-token", org_id="1")
-        with pytest.raises(DevhelmError, match="workspace_id is required"):
-            build_client(config)
+        client = build_client(config)
+        assert client.headers["x-phelm-org-id"] == "1"
+        assert client.headers["x-phelm-workspace-id"] == "1"
+        client.close()
 
     def test_reads_from_env(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setenv("DEVHELM_ORG_ID", "42")
@@ -72,9 +67,7 @@ def test_config_overrides_env(self, monkeypatch: pytest.MonkeyPatch) -> None:
         assert client.headers["x-phelm-workspace-id"] == "cfg-ws"
         client.close()
 
-    def test_strips_trailing_slash(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setenv("DEVHELM_ORG_ID", "1")
-        monkeypatch.setenv("DEVHELM_WORKSPACE_ID", "1")
+    def test_strips_trailing_slash(self) -> None:
         config = DevhelmConfig(token="t", base_url="https://api.example.com///")
         client = build_client(config)
         assert str(client.base_url) == "https://api.example.com"