lsrestclient 3.2.2__tar.gz → 3.3.1__tar.gz

{lsrestclient-3.2.2 → lsrestclient-3.3.1}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.1
 Name: lsrestclient
-Version: 3.2.2
+Version: 3.3.1
 Summary: REST Api Client
 Author: mba
 Author-email: bartel@electronic-shop.lu
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
+Provides-Extra: redis
 Requires-Dist: lsjsonclasses (>=2.0.1,<3.0.0)
+Requires-Dist: pydantic (>=2.11.7,<3.0.0)
+Requires-Dist: pydantic-settings (>=2.10.1,<3.0.0)
 Requires-Dist: pydash (>4.0.0)
+Requires-Dist: redis (>=6.4.0,<7.0.0) ; extra == "redis"
 Requires-Dist: requests (>=2.31.0,<3.0.0)
+Requires-Dist: requests-cache (>=1.2.1,<2.0.0)
 Requires-Dist: webexception (>=1.0.5,<2.0.0)
 Description-Content-Type: text/markdown
 

{lsrestclient-3.2.2 → lsrestclient-3.3.1}/lsrestclient/client.py

@@ -1,23 +1,33 @@
 import os
+from enum import Enum
 from typing import Optional, Dict, Any
 from unittest.mock import MagicMock
 
 import lsjsonclasses
 import requests
-from requests import Session
+import requests_cache
+from requests import Response, Session
 
 import re
 
+from requests_cache import CachedSession, SQLiteCache
+
 from lsrestclient import (
     LsRestClientResponse,
     exceptions,
 )
 from lsrestclient.contexts.bearer_token import bearer_token_context
+from lsrestclient.settings import LsRestClientSettings
 
 find_parameters_regex = re.compile("{(.*?)}")
 
 
-class LsRestClient(Session):
+class LsRestClientBackendEnum(str, Enum):
+    sqlite = "sqlite"
+    redis = "redis"
+
+
+class LsRestClient(object):
     _clients = {}
 
     @classmethod
@@ -65,8 +75,28 @@ class LsRestClient(Session):
         name: str = "default",
         headers: dict = None,
         ignore_bearer_context: bool = False,
+        cache: bool = False,
+        cache_backend: LsRestClientBackendEnum = LsRestClientBackendEnum.sqlite,
     ) -> None:
         """Class representing a REST client for JSON API."""
+        if cache:
+            if cache_backend == LsRestClientBackendEnum.redis:
+                settings = LsRestClientSettings()
+                backend = requests_cache.RedisCache(
+                    namespace=f"lsrestclient_{name}",
+                    host=settings.redis_host,
+                    port=settings.redis_port,
+                    db=settings.redis_db,
+                    ttl=settings.redis_ttl,
+                    ttl_offset=settings.redis_ttl_offset,
+                )
+            else:
+                backend = SQLiteCache(f".cache/{name}")
+
+            self._session = CachedSession(backend=backend, cache_control=True, filter_fn=self.cache_filter)
+
+        else:
+            self._session = Session()
 
         self._mocks = {}
         self.base_url = base_url
@@ -83,6 +113,13 @@ class LsRestClient(Session):
         super().__init__()
         self._clients[name] = self
 
+    def cache_filter(self, response: Response) -> bool:
+        settings = LsRestClientSettings()
+        cache_control = response.headers.get("Cache-Control")
+        if not cache_control and settings.insert_no_cache:
+            return False
+        return True
+
     @staticmethod
     def mock_name(client_name: str, method: str, url: str) -> str:
         return f"{client_name}_{method.upper()}_{url}"
@@ -203,7 +240,14 @@ class LsRestClient(Session):
 
         try:
             # noinspection PyArgumentList
-            requests_response = requests.request(
+            # requests_response = requests.request(
+            #     method.upper(),
+            #     full_url,
+            #     *args,
+            #     params=params,
+            #     **kwargs,
+            # )
+            requests_response = self._session.request(
                 method.upper(),
                 full_url,
                 *args,
@@ -314,4 +358,3 @@ class LsRestClientTestClient(LsRestClient):
     ):
         r = self.test_client.request(method, url, *args, params=params, **kwargs)
         return LsRestClientResponse(status_code=r.status_code, content=r.content.decode("utf8"), headers=r.headers)
-

{lsrestclient-3.2.2 → lsrestclient-3.3.1}/lsrestclient/lsfastapi.py

@@ -24,10 +24,10 @@ class LsFastApiClientBase(ABC):
         return cls._client
 
     @classmethod
-    def register(cls, base_url: str = None) -> LsRestClient:
+    def register(cls, base_url: str = None, **kwargs) -> LsRestClient:
         # noinspection PyArgumentList
         log.debug(f"Registering {cls.client_name} API client at {base_url}")
-        cls._client = LsRestClient(name=cls.client_name, base_url=base_url or cls.base_url())
+        cls._client = LsRestClient(name=cls.client_name, base_url=base_url or cls.base_url(), **kwargs)
         return cls._client
 
     @classmethod

{lsrestclient-3.2.2 → lsrestclient-3.3.1}/lsrestclient/response.py

@@ -1,3 +1,4 @@
+import datetime
 from dataclasses import dataclass
 from typing import Optional
 
@@ -5,6 +6,7 @@ import lsjsonclasses
 import pydash
 from requests import Response
 from requests.structures import CaseInsensitiveDict
+from requests_cache import CachedResponse
 
 
 @dataclass
@@ -16,6 +18,11 @@ class LsRestClientResponse:
     status_code: int
     content: str
     headers: CaseInsensitiveDict
+    created_at: datetime.datetime | None = None
+    expires: datetime.datetime | None = None
+    cache_key: str | None = None
+    revalidated: bool | None = None
+    from_cache: bool | None = False
 
     _json: Optional[dict] = None
 
@@ -43,11 +50,14 @@ class LsRestClientResponse:
         else:
             content = response.content.decode("utf8" if encoding is None else encoding)
 
-        return cls(
-            status_code=response.status_code,
-            content=content,
-            headers=response.headers,
-        )
+        ret = cls(status_code=response.status_code, content=content, headers=response.headers)
+        if isinstance(response, CachedResponse):
+            ret.created_at = response.created_at
+            ret.expires = response.expires
+            ret.cache_key = response.cache_key
+            ret.revalidated = response.revalidated
+            ret.from_cache = response.from_cache
+        return ret
 
     @classmethod
     def from_dict(cls, status_code: int = 200, data: dict = None, headers: CaseInsensitiveDict = None):

lsrestclient-3.3.1/lsrestclient/settings.py

@@ -0,0 +1,11 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class LsRestClientSettings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix="lsrestclient_")
+    insert_no_cache: bool = True
+    redis_host: str = "localhost"
+    redis_port: int = 6379
+    redis_db: int = 10
+    redis_ttl: bool = True
+    redis_ttl_offset: int = 3600

{lsrestclient-3.2.2 → lsrestclient-3.3.1}/pyproject.toml

@@ -1,20 +1,31 @@
 [tool.poetry]
 name = "lsrestclient"
-version = "3.2.2"
+version = "3.3.1"
 description = "REST Api Client"
 authors = ["mba <bartel@electronic-shop.lu>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.12"
 requests = "^2.31.0"
 lsjsonclasses = "^2.0.1"
 pydash = ">4.0.0"
 webexception = "^1.0.5"
+requests-cache = "^1.2.1"
+pydantic = "^2.11.7"
+pydantic-settings = "^2.10.1"
+redis = "^6.4.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"
 black = "^23.7.0"
+fastapi = "^0.104.1"
+uvicorn = "^0.35.0"
+killport = "^1.2.0"
+fastapi-lsoft = "^1.0.0"
+
+[tool.poetry.extras]
+redis = ["redis"]
 
 [build-system]
 requires = ["poetry-core"]
@@ -29,8 +40,8 @@ testpaths = [
 log_cli = true
 log_cli_level = "DEBUG"
 #log_cli_level = "INFO"
-log_cli_format = "[%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
-#log_cli_format = "[%(name)s][%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+#log_cli_format = "[%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+log_cli_format = "[%(name)s][%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
 
 [tool.black]
 line-length = 120