http: api: allow overriding auth by service

rnovatorov · rnovatorov · commit cb724ae2359c · 2026-02-10T16:47:39.000+01:00
diff --git a/src/enapter/cli/http/api/blueprint_download_command.py b/src/enapter/cli/http/api/blueprint_download_command.py
@@ -29,7 +29,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            content = await client.blueprints.download(
+            content = await client.blueprints().download(
                 args.id, view=http.api.blueprints.BlueprintView(args.view.upper())
             )
             with open(args.output, "wb") as f:
diff --git a/src/enapter/cli/http/api/blueprint_get_command.py b/src/enapter/cli/http/api/blueprint_get_command.py
@@ -19,5 +19,5 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            blueprint = await client.blueprints.get(blueprint_id=args.id)
+            blueprint = await client.blueprints().get(blueprint_id=args.id)
             print(json.dumps(blueprint.to_dto()))
diff --git a/src/enapter/cli/http/api/blueprint_upload_command.py b/src/enapter/cli/http/api/blueprint_upload_command.py
@@ -23,7 +23,7 @@ def register(parent: cli.Subparsers) -> None:
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
             if args.path.is_dir():
-                blueprint = await client.blueprints.upload_directory(args.path)
+                blueprint = await client.blueprints().upload_directory(args.path)
             else:
-                blueprint = await client.blueprints.upload_file(args.path)
+                blueprint = await client.blueprints().upload_file(args.path)
             print(json.dumps(blueprint.to_dto()))
diff --git a/src/enapter/cli/http/api/blueprint_validate_command.py b/src/enapter/cli/http/api/blueprint_validate_command.py
@@ -22,6 +22,6 @@ def register(parent: cli.Subparsers) -> None:
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
             if args.path.is_dir():
-                await client.blueprints.validate_directory(args.path)
+                await client.blueprints().validate_directory(args.path)
             else:
-                await client.blueprints.validate_file(args.path)
+                await client.blueprints().validate_file(args.path)
diff --git a/src/enapter/cli/http/api/command_create_execution_command.py b/src/enapter/cli/http/api/command_create_execution_command.py
@@ -33,7 +33,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            execution = await client.commands.create_execution(
+            execution = await client.commands().create_execution(
                 device_id=args.device_id, name=args.name, arguments=args.arguments
             )
             print(json.dumps(execution.to_dto()))
diff --git a/src/enapter/cli/http/api/command_execute_command.py b/src/enapter/cli/http/api/command_execute_command.py
@@ -39,7 +39,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            execution = await client.commands.execute(
+            execution = await client.commands().execute(
                 device_id=args.device_id,
                 name=args.name,
                 arguments=args.arguments,
diff --git a/src/enapter/cli/http/api/command_get_execution_command.py b/src/enapter/cli/http/api/command_get_execution_command.py
@@ -33,7 +33,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            execution = await client.commands.get_execution(
+            execution = await client.commands().get_execution(
                 device_id=args.device_id,
                 execution_id=args.execution_id,
                 expand_log=args.log,
diff --git a/src/enapter/cli/http/api/command_list_executions_command.py b/src/enapter/cli/http/api/command_list_executions_command.py
@@ -37,7 +37,7 @@ async def run(args: argparse.Namespace) -> None:
         if args.limit == 0:
             return
         async with http.api.Client(http.api.Config.from_env()) as client:
-            async with client.commands.list_executions(
+            async with client.commands().list_executions(
                 device_id=args.device_id,
                 order=http.api.commands.ListExecutionsOrder(args.order.upper()),
             ) as stream:
diff --git a/src/enapter/cli/http/api/device_assign_blueprint_command.py b/src/enapter/cli/http/api/device_assign_blueprint_command.py
@@ -22,7 +22,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            device = await client.devices.assign_blueprint(
+            device = await client.devices().assign_blueprint(
                 device_id=args.id, blueprint_id=args.blueprint_id
             )
             print(json.dumps(device.to_dto()))
diff --git a/src/enapter/cli/http/api/device_create_lua_command.py b/src/enapter/cli/http/api/device_create_lua_command.py
@@ -23,7 +23,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            device = await client.devices.create_lua(
+            device = await client.devices().create_lua(
                 runtime_id=args.runtime_id,
                 blueprint_id=args.blueprint_id,
                 name=args.name,
diff --git a/src/enapter/cli/http/api/device_create_standalone_command.py b/src/enapter/cli/http/api/device_create_standalone_command.py
@@ -20,7 +20,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            device = await client.devices.create_standalone(
+            device = await client.devices().create_standalone(
                 name=args.name, site_id=args.site_id, slug=args.slug
             )
             print(json.dumps(device.to_dto()))
diff --git a/src/enapter/cli/http/api/device_create_vucm_command.py b/src/enapter/cli/http/api/device_create_vucm_command.py
@@ -18,7 +18,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            device = await client.devices.create_vucm(
+            device = await client.devices().create_vucm(
                 name=args.name, site_id=args.site_id, hardware_id=args.hardware_id
             )
             print(json.dumps(device.to_dto()))
diff --git a/src/enapter/cli/http/api/device_delete_command.py b/src/enapter/cli/http/api/device_delete_command.py
@@ -22,6 +22,6 @@ async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
             for id in args.ids:
                 try:
-                    await client.devices.delete(id)
+                    await client.devices().delete(id)
                 except http.api.Error as e:
                     LOGGER.error("failed to delete device %s: %s", id, e)
diff --git a/src/enapter/cli/http/api/device_generate_communication_config_command.py b/src/enapter/cli/http/api/device_generate_communication_config_command.py
@@ -26,7 +26,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            config = await client.devices.generate_communication_config(
+            config = await client.devices().generate_communication_config(
                 args.id,
                 mqtt_protocol=http.api.devices.MQTTProtocol(args.protocol.upper()),
             )
diff --git a/src/enapter/cli/http/api/device_get_command.py b/src/enapter/cli/http/api/device_get_command.py
@@ -42,7 +42,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            device = await client.devices.get(
+            device = await client.devices().get(
                 args.id,
                 expand_manifest=args.manifest,
                 expand_properties=args.properties,
diff --git a/src/enapter/cli/http/api/device_list_command.py b/src/enapter/cli/http/api/device_list_command.py
@@ -48,7 +48,7 @@ async def run(args: argparse.Namespace) -> None:
         if args.limit == 0:
             return
         async with http.api.Client(http.api.Config.from_env()) as client:
-            async with client.devices.list(
+            async with client.devices().list(
                 expand_manifest=args.manifest,
                 expand_properties=args.properties,
                 expand_connectivity=args.connectivity,
diff --git a/src/enapter/cli/http/api/device_update_command.py b/src/enapter/cli/http/api/device_update_command.py
@@ -22,7 +22,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            device = await client.devices.update(
+            device = await client.devices().update(
                 args.id, name=args.name, slug=args.slug
             )
             print(json.dumps(device.to_dto()))
diff --git a/src/enapter/cli/http/api/site_create_command.py b/src/enapter/cli/http/api/site_create_command.py
@@ -27,7 +27,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            site = await client.sites.create(
+            site = await client.sites().create(
                 name=args.name,
                 timezone=args.timezone,
                 location=(
diff --git a/src/enapter/cli/http/api/site_delete_command.py b/src/enapter/cli/http/api/site_delete_command.py
@@ -15,4 +15,4 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            await client.sites.delete(args.id)
+            await client.sites().delete(args.id)
diff --git a/src/enapter/cli/http/api/site_get_command.py b/src/enapter/cli/http/api/site_get_command.py
@@ -18,5 +18,5 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            site = await client.sites.get(args.id)
+            site = await client.sites().get(args.id)
             print(json.dumps(site.to_dto()))
diff --git a/src/enapter/cli/http/api/site_list_command.py b/src/enapter/cli/http/api/site_list_command.py
@@ -24,7 +24,7 @@ async def run(args: argparse.Namespace) -> None:
         if args.limit == 0:
             return
         async with http.api.Client(http.api.Config.from_env()) as client:
-            async with client.sites.list() as stream:
+            async with client.sites().list() as stream:
                 count = 0
                 async for site in stream:
                     print(json.dumps(site.to_dto()))
diff --git a/src/enapter/cli/http/api/site_update_command.py b/src/enapter/cli/http/api/site_update_command.py
@@ -28,7 +28,7 @@ def register(parent: cli.Subparsers) -> None:
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         async with http.api.Client(http.api.Config.from_env()) as client:
-            site = await client.sites.update(
+            site = await client.sites().update(
                 site_id=args.id,
                 name=args.name,
                 timezone=args.timezone,
diff --git a/src/enapter/cli/http/api/telemetry_latest_command.py b/src/enapter/cli/http/api/telemetry_latest_command.py
@@ -25,7 +25,7 @@ async def run(args: argparse.Namespace) -> None:
             device, attributes = selector.split(":", 1)
             attributes_by_device[device] = attributes.split(",")
         async with http.api.Client(http.api.Config.from_env()) as client:
-            telemetry = await client.telemetry.latest(attributes_by_device)
+            telemetry = await client.telemetry().latest(attributes_by_device)
             dto = {
                 device: {
                     attribute: datapoint.to_dto() if datapoint is not None else None
diff --git a/src/enapter/cli/http/api/telemetry_timeseries_command.py b/src/enapter/cli/http/api/telemetry_timeseries_command.py
@@ -79,7 +79,7 @@ async def _handle_long_timeseries(
         time_to: datetime.datetime,
         attributes_by_device: dict[str, list[str]],
     ) -> None:
-        async with client.telemetry.long_timeseries(
+        async with client.telemetry().long_timeseries(
             from_=time_from,
             to=time_to,
             granularity=args.granularity,
@@ -99,7 +99,7 @@ async def _handle_wide_timeseries(
         time_to: datetime.datetime,
         attributes_by_device: dict[str, list[str]],
     ) -> None:
-        wide_timeseries = await client.telemetry.wide_timeseries(
+        wide_timeseries = await client.telemetry().wide_timeseries(
             from_=time_from,
             to=time_to,
             granularity=args.granularity,
diff --git a/src/enapter/http/api/client.py b/src/enapter/http/api/client.py
@@ -18,9 +18,10 @@ def __init__(self, config: Config) -> None:
             self._headers["X-Enapter-Allow-HTTP"] = "true"
         self._transport = httpx.AsyncHTTPTransport()
 
-    def _new_client(self) -> httpx.AsyncClient:
+    def _new_client(self, auth: Auth | None) -> httpx.AsyncClient:
+        auth = auth if auth is not None else self._auth
         return httpx.AsyncClient(
-            auth=self._auth,
+            auth=auth,
             headers=self._headers,
             base_url=self._config.base_url,
             transport=self._transport,
@@ -33,22 +34,17 @@ async def __aenter__(self) -> Self:
     async def __aexit__(self, *exc) -> None:
         await self._transport.__aexit__(*exc)
 
-    @property
-    def devices(self) -> devices.Client:
-        return devices.Client(client=self._new_client())
+    def devices(self, auth: Auth | None = None) -> devices.Client:
+        return devices.Client(client=self._new_client(auth=auth))
 
-    @property
-    def sites(self) -> sites.Client:
-        return sites.Client(client=self._new_client())
+    def sites(self, auth: Auth | None = None) -> sites.Client:
+        return sites.Client(client=self._new_client(auth=auth))
 
-    @property
-    def commands(self) -> commands.Client:
-        return commands.Client(client=self._new_client())
+    def commands(self, auth: Auth | None = None) -> commands.Client:
+        return commands.Client(client=self._new_client(auth=auth))
 
-    @property
-    def blueprints(self) -> blueprints.Client:
-        return blueprints.Client(client=self._new_client())
+    def blueprints(self, auth: Auth | None = None) -> blueprints.Client:
+        return blueprints.Client(client=self._new_client(auth=auth))
 
-    @property
-    def telemetry(self) -> telemetry.Client:
-        return telemetry.Client(client=self._new_client())
+    def telemetry(self, auth: Auth | None = None) -> telemetry.Client:
+        return telemetry.Client(client=self._new_client(auth=auth))

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ def register(parent: cli.Subparsers) -> None:`
`29`	`29`	`@staticmethod`
`30`	`30`	`async def run(args: argparse.Namespace) -> None:`
`31`	`31`	`async with http.api.Client(http.api.Config.from_env()) as client:`
`32`		`- content = await client.blueprints.download(`
	`32`	`+ content = await client.blueprints().download(`
`33`	`33`	`args.id, view=http.api.blueprints.BlueprintView(args.view.upper())`
`34`	`34`	`)`
`35`	`35`	`with open(args.output, "wb") as f:`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ def register(parent: cli.Subparsers) -> None:`
`33`	`33`	`@staticmethod`
`34`	`34`	`async def run(args: argparse.Namespace) -> None:`
`35`	`35`	`async with http.api.Client(http.api.Config.from_env()) as client:`
`36`		`- execution = await client.commands.create_execution(`
	`36`	`+ execution = await client.commands().create_execution(`
`37`	`37`	`device_id=args.device_id, name=args.name, arguments=args.arguments`
`38`	`38`	`)`
`39`	`39`	`print(json.dumps(execution.to_dto()))`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def register(parent: cli.Subparsers) -> None:`
`22`	`22`	`@staticmethod`
`23`	`23`	`async def run(args: argparse.Namespace) -> None:`
`24`	`24`	`async with http.api.Client(http.api.Config.from_env()) as client:`
`25`		`- device = await client.devices.assign_blueprint(`
	`25`	`+ device = await client.devices().assign_blueprint(`
`26`	`26`	`device_id=args.id, blueprint_id=args.blueprint_id`
`27`	`27`	`)`
`28`	`28`	`print(json.dumps(device.to_dto()))`