neris-api-client 1.3.0__tar.gz → 1.3.2__tar.gz

{neris_api_client-1.3.0/src/neris_api_client.egg-info → neris_api_client-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: neris_api_client
-Version: 1.3.0
+Version: 1.3.2
 Summary: NERIS API Client
 Author-email: Ben Coleman <ben.coleman@ul.org>, Tommy Messbauer <thomas.messbauer@ul.org>, Joseph Pagani <joseph.pagani@ul.org>
 Project-URL: Homepage, https://github.com/ulfsri/neris-api-client
@@ -97,6 +97,14 @@ client = NerisApiClient()
 entity = client.get_entity("FD24027240")
 ```
 
+## Additional config parameters
+
+| Parameter | Description                                                 |
+| --------- | ----------------------------------------------------------- |
+| debug     | Controls whether the application outputs debug information. |
+| validate  | Controls whether the client performs model validations.     |
+
+
 ## Disclaimer
 The models in this package are generated using [`datamodel-code-generator`](https://github.com/koxudaxi/datamodel-code-generator) and are not guaranteed
 to contain all of the information present in the full specification. The generated models are used to validate request payloads prior to

{neris_api_client-1.3.0 → neris_api_client-1.3.2}/README.md

@@ -80,6 +80,14 @@ client = NerisApiClient()
 entity = client.get_entity("FD24027240")
 ```
 
+## Additional config parameters
+
+| Parameter | Description                                                 |
+| --------- | ----------------------------------------------------------- |
+| debug     | Controls whether the application outputs debug information. |
+| validate  | Controls whether the client performs model validations.     |
+
+
 ## Disclaimer
 The models in this package are generated using [`datamodel-code-generator`](https://github.com/koxudaxi/datamodel-code-generator) and are not guaranteed
 to contain all of the information present in the full specification. The generated models are used to validate request payloads prior to

{neris_api_client-1.3.0 → neris_api_client-1.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "neris_api_client"
-version = "1.3.0"
+version = "1.3.2"
 authors = [
   { name="Ben Coleman", email="ben.coleman@ul.org" },
   { name="Tommy Messbauer", email="thomas.messbauer@ul.org" },

{neris_api_client-1.3.0 → neris_api_client-1.3.2}/src/neris_api_client/client.py

@@ -47,6 +47,7 @@ class _NerisApiClient:
             case GrantType.CLIENT_CREDENTIALS:
                 assert config.client_id is not None
                 assert config.client_secret is not None
+                self.client_creds = base64.b64encode(f"{config.client_id}:{config.client_secret}".encode("utf-8")).decode("utf-8")
             case GrantType.PASSWORD:
                 assert config.username is not None
                 assert config.password is not None
@@ -73,11 +74,9 @@ class _NerisApiClient:
                     )
 
                 case GrantType.CLIENT_CREDENTIALS:
-                    client_creds = base64.b64encode(f"{self.config.client_id}:{self.config.client_secret}".encode("utf-8")).decode("utf-8")
-
                     res = self._session.post(
                         token_url,
-                        headers={"Authorization": f"Basic {client_creds}", 'Content-Type': 'application/x-www-form-urlencoded'},
+                        headers={"Authorization": f"Basic {self.client_creds}", "Content-Type": "application/x-www-form-urlencoded"},
                         data={"grant_type": GrantType.CLIENT_CREDENTIALS},
                     )
 
@@ -87,7 +86,7 @@ class _NerisApiClient:
                     res = self._session.post(
                         token_url,
                         # No basic auth needed for Cognito refresh tokens
-                        headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                        headers={"Content-Type": "application/x-www-form-urlencoded"},
                         data={
                             "grant_type": "refresh_token",
                             "refresh_token": self.tokens.refresh_token,
@@ -97,7 +96,8 @@ class _NerisApiClient:
                 case GrantType.CLIENT_CREDENTIALS:
                     res = self._session.post(
                         token_url,
-                        headers={"Authorization": f"Basic {client_creds}", 'Content-Type': 'application/x-www-form-urlencoded'},
+                        # Basic auth required for NERIS refresh tokens
+                        headers={"Authorization": f"Basic {self.client_creds}", "Content-Type": "application/x-www-form-urlencoded"},
                         data={
                             "grant_type": "refresh_token",
                             "refresh_token": self.tokens.refresh_token,
@@ -161,7 +161,7 @@ class _NerisApiClient:
         self._update_auth()
         self._session.headers.update({"Authorization": f"Bearer {self.tokens.access_token}"})
 
-        if model:
+        if self.config.validate and model:
             if isinstance(data, str):
                 data = model.model_validate_json(data).model_dump(mode="json", by_alias=True)
             if isinstance(data, dict):

{neris_api_client-1.3.0 → neris_api_client-1.3.2}/src/neris_api_client/config.py

@@ -16,11 +16,13 @@ class Config:
     client_id: str | None = None
     client_secret: str | None = None
     grant_type: GrantType | None = None
+    validate: bool | None = None
 
     def __post_init__(self):
         # env var handling
         self.base_url = self.base_url or os.getenv("NERIS_BASE_URL")
         self.debug = self.debug if self.debug is not None else os.getenv("NERIS_DEBUG") == "true"
+        self.validate = self.validate if self.validate is not None else os.getenv("NERIS_VALIDATE") == "true"
 
         match os.getenv("NERIS_GRANT_TYPE"):
             case GrantType.PASSWORD:

{neris_api_client-1.3.0 → neris_api_client-1.3.2/src/neris_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: neris_api_client
-Version: 1.3.0
+Version: 1.3.2
 Summary: NERIS API Client
 Author-email: Ben Coleman <ben.coleman@ul.org>, Tommy Messbauer <thomas.messbauer@ul.org>, Joseph Pagani <joseph.pagani@ul.org>
 Project-URL: Homepage, https://github.com/ulfsri/neris-api-client
@@ -97,6 +97,14 @@ client = NerisApiClient()
 entity = client.get_entity("FD24027240")
 ```
 
+## Additional config parameters
+
+| Parameter | Description                                                 |
+| --------- | ----------------------------------------------------------- |
+| debug     | Controls whether the application outputs debug information. |
+| validate  | Controls whether the client performs model validations.     |
+
+
 ## Disclaimer
 The models in this package are generated using [`datamodel-code-generator`](https://github.com/koxudaxi/datamodel-code-generator) and are not guaranteed
 to contain all of the information present in the full specification. The generated models are used to validate request payloads prior to