cmsdials 1.2.0__tar.gz → 1.3.0__tar.gz

{cmsdials-1.2.0 → cmsdials-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmsdials
-Version: 1.2.0
+Version: 1.3.0
 Summary: The Python api client interface to DIALS service
 Home-page: https://github.com/cms-DQM/dials-py
 Author: Gabriel Moreira

{cmsdials-1.2.0 → cmsdials-1.3.0}/cmsdials/clients/file_index/models.py

@@ -14,7 +14,7 @@ class FileIndex(BaseModel):
     creation_date: datetime
     last_modification_date: datetime
     logical_file_name: str
-    status: str = Field(..., max_length=15)
+    status: str = Field(..., max_length=255)
     err_trace: Optional[str] = Field(..., max_length=5000)
 
 

cmsdials-1.3.0/cmsdials/clients/oms_proxy/client.py

@@ -0,0 +1,46 @@
+from typing import Optional
+
+import requests
+from requests.exceptions import HTTPError
+
+from ...auth._base import BaseCredentials
+from ...utils.api_client import BaseAPIClient
+from ...utils.logger import logger
+from .models import OMSFilter, OMSPage
+
+
+class OMSProxyClient(BaseAPIClient):
+    default_timeout = 30
+    lookup_url = "oms-proxy/"
+
+    def __init__(
+        self,
+        creds: BaseCredentials,
+        *args: str,
+        **kwargs: str,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+        self.creds = creds
+
+    def _build_headers(self) -> dict:
+        base = {"accept": "application/json"}
+        self.creds.before_request(base)
+        return base
+
+    def query(self, endpoint: str, filters: list[OMSFilter], pages: Optional[list[OMSPage]] = None):
+        headers = self._build_headers()
+        endpoint_url = self.api_url + self.lookup_url
+
+        # Format filters
+        filters = {f"filter[{_filter.attribute_name}][{_filter.operator}]": _filter.value for _filter in filters}
+        pages = {f"page[{page.attribute_name}]": page.value for page in pages} if pages and len(pages) > 0 else {}
+        params = {"endpoint": endpoint, **filters, **pages}
+
+        response = requests.get(endpoint_url, headers=headers, params=params, timeout=self.default_timeout)
+        try:
+            response.raise_for_status()
+        except HTTPError as err:
+            logger.info(f"Api raw response: {response.text}")
+            raise err
+
+        return response.json()

cmsdials-1.3.0/cmsdials/clients/oms_proxy/models.py

@@ -0,0 +1,14 @@
+from typing import Literal, Union
+
+from pydantic import BaseModel
+
+
+class OMSFilter(BaseModel):
+    attribute_name: str
+    value: Union[str, int, float]
+    operator: Literal["EQ", "NEQ", "LT", "GT", "LE", "GE", "LIKE"]
+
+
+class OMSPage(BaseModel):
+    attribute_name: str
+    value: int

{cmsdials-1.2.0 → cmsdials-1.3.0}/cmsdials/cmsdials.py

@@ -6,6 +6,7 @@ from .clients.h1d.client import LumisectionHistogram1DClient
 from .clients.h2d.client import LumisectionHistogram2DClient
 from .clients.lumisection.client import LumisectionClient
 from .clients.mes.client import MonitoringElementClient
+from .clients.oms_proxy.client import OMSProxyClient
 from .clients.run.client import RunClient
 
 
@@ -17,3 +18,4 @@ class Dials:
         self.lumi = LumisectionClient(creds, workspace, *args, **kwargs)
         self.run = RunClient(creds, workspace, *args, **kwargs)
         self.mes = MonitoringElementClient(creds, workspace, *args, **kwargs)
+        self.oms = OMSProxyClient(creds, *args, **kwargs)

{cmsdials-1.2.0 → cmsdials-1.3.0}/cmsdials/filters.py

@@ -3,6 +3,7 @@ from .clients.h1d.models import LumisectionHistogram1DFilters
 from .clients.h2d.models import LumisectionHistogram2DFilters
 from .clients.lumisection.models import LumisectionFilters
 from .clients.mes.models import MEFilters
+from .clients.oms_proxy.models import OMSFilter, OMSPage
 from .clients.run.models import RunFilters
 
 
@@ -13,4 +14,6 @@ __all__ = [
     "LumisectionFilters",
     "RunFilters",
     "MEFilters",
+    "OMSFilter",
+    "OMSPage",
 ]

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmsdials"
-version = "1.2.0"
+version = "1.3.0"
 description = "The Python api client interface to DIALS service"
 authors = ["Gabriel Moreira <gabrielmscampos@gmail.com>"]
 readme = "README.md"