qtoggleserver-generic-http 1.2.0__tar.gz → 1.3.0__tar.gz

{qtoggleserver_generic_http-1.2.0/qtoggleserver_generic_http.egg-info → qtoggleserver_generic_http-1.3.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: qtoggleserver-generic-http
-Version: 1.2.0
+Version: 1.3.0
 Summary: qToggleServer ports backed by configurable HTTP requests
 Author-email: Calin Crisan <ccrisan@gmail.com>
 License: Apache 2.0
-Requires-Python: ==3.10.*
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiohttp

{qtoggleserver_generic_http-1.2.0 → qtoggleserver_generic_http-1.3.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "qtoggleserver-generic-http"
-version = "1.2.0"
+version = "1.3.0"
 description = "qToggleServer ports backed by configurable HTTP requests"
 authors = [
     {name = "Calin Crisan", email = "ccrisan@gmail.com"},
 ]
-requires-python = "==3.10.*"
+requires-python = ">=3.11"
 readme = "README.md"
 license = {text = "Apache 2.0"}
 dependencies = [
@@ -22,7 +22,6 @@ dev = [
 
 [tool.ruff]
 line-length = 120
-target-version = "py310"
 lint.extend-select = ["I", "RUF022", "ANN"]
 lint.extend-ignore = ["ANN002", "ANN003", "ANN401"]
 lint.isort.lines-after-imports = 2

{qtoggleserver_generic_http-1.2.0 → qtoggleserver_generic_http-1.3.0}/qtoggleserver/generichttp/client.py

@@ -3,11 +3,12 @@ import logging
 from typing import Any
 
 import aiohttp
-import jinja2.nativetypes
 
+from qtoggleserver.conf import metadata
 from qtoggleserver.core import ports as core_ports
 from qtoggleserver.lib import polled
 from qtoggleserver.utils import json as json_utils
+from qtoggleserver.utils import template as template_utils
 
 
 DEFAULT_TIMEOUT = 10  # seconds
@@ -47,9 +48,6 @@ class GenericHTTPClient(polled.PolledPeripheral):
         self.last_response_json: Any | None = None
         self.last_response_headers: dict[str, Any] | None = None
 
-        self._j2env: jinja2.nativetypes.NativeEnvironment = jinja2.nativetypes.NativeEnvironment(enable_async=True)
-        self._j2env.globals.update(__builtins__)
-
         super().__init__(**kwargs)
 
     async def make_port_args(self) -> list[dict[str, Any] | type[core_ports.BasePort]]:
@@ -61,11 +59,17 @@ class GenericHTTPClient(polled.PolledPeripheral):
 
         return port_args
 
+    def get_common_context(self) -> dict:
+        return {
+            "metadata": metadata.get_all(),
+        }
+
     async def poll(self) -> None:
         self.debug("read request %s %s", self.read_details["method"], self.read_details["url"])
 
         async with aiohttp.ClientSession() as session:
-            request_params = await self.prepare_request(self.read_details, {})
+            context = self.get_common_context()
+            request_params = await self.prepare_request(self.read_details, context)
             async with session.request(**request_params) as response:
                 data = await response.read()
 
@@ -86,7 +90,7 @@ class GenericHTTPClient(polled.PolledPeripheral):
         for k, v in self.write_details.items():
             details.setdefault(k, v)
 
-        context = dict(context, **(await self.get_placeholders_context(port)))
+        context = self.get_common_context() | await self.get_placeholders_context(port) | context
 
         async with aiohttp.ClientSession() as session:
             request_params = await self.prepare_request(details, context)
@@ -158,7 +162,6 @@ class GenericHTTPClient(polled.PolledPeripheral):
         elif isinstance(obj, list):
             return [await self.replace_placeholders_rec(e, context) for e in obj]
         elif isinstance(obj, str):
-            template = self._j2env.from_string(obj)
-            return await template.render_async(context)
+            return await template_utils.render_native(obj, context)
         else:
             return obj

{qtoggleserver_generic_http-1.2.0 → qtoggleserver_generic_http-1.3.0/qtoggleserver_generic_http.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: qtoggleserver-generic-http
-Version: 1.2.0
+Version: 1.3.0
 Summary: qToggleServer ports backed by configurable HTTP requests
 Author-email: Calin Crisan <ccrisan@gmail.com>
 License: Apache 2.0
-Requires-Python: ==3.10.*
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiohttp

{qtoggleserver_generic_http-1.2.0 → qtoggleserver_generic_http-1.3.0}/qtoggleserver/generichttp/ports.py

@@ -22,10 +22,6 @@ class GenericHTTPPort(polled.PolledPort):
         write: dict[str, Any] | None = None,
         **kwargs,
     ) -> None:
-        # These will directly determine the port type attribute
-        self._type = type
-        self._writable = writable
-
         self._write_details: dict[str, Any] = write or {}
 
         json_path = read.get("json_path")
@@ -40,6 +36,10 @@ class GenericHTTPPort(polled.PolledPort):
 
         super().__init__(id=id, **kwargs)
 
+        # These will directly determine the port type attribute
+        self._type = type
+        self._writable = writable
+
     def get_peripheral(self) -> GenericHTTPClient:
         return cast(GenericHTTPClient, super().get_peripheral())