sysnet-pyutils 1.4.0__tar.gz → 1.4.2__tar.gz

{sysnet_pyutils-1.4.0/sysnet_pyutils.egg-info → sysnet_pyutils-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysnet-pyutils
-Version: 1.4.0
+Version: 1.4.2
 Summary: Python Utilities
 Author-email: Data Developer <info@sysnet.cz>
 Project-URL: Homepage, https://github.com/SYSNET-CZ/pyutils
@@ -14,10 +14,11 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: typing-extensions>=4.12.0
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: pytz>=2023.3
 Requires-Dist: python-dateutil>=2.8.2
-Requires-Dist: xmltodict>=0.13.0
+Requires-Dist: xmltodict>=1.0.0
 Requires-Dist: boto3>=1.34.34
 Requires-Dist: botocore>=1.34.34
 Requires-Dist: pymongo>=4.7.2

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sysnet-pyutils"
-version = "1.4.0"
+version = "1.4.2"
 authors = [
   { name="Data Developer", email="info@sysnet.cz" },
 ]

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2}/requirements.txt

@@ -1,7 +1,8 @@
+typing-extensions>=4.12.0
 PyYAML>=6.0.1
 pytz>=2023.3
 python-dateutil>=2.8.2
-xmltodict>=0.13.0
+xmltodict>=1.0.0
 
 boto3>=1.34.34
 botocore>=1.34.34

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2}/sysnet_pyutils/constants.py

@@ -5,6 +5,9 @@ CONFIG_WSDL = 'wsdl'            # WSDL parametr
 CONFIG_PASSWD = 'paswd'         # Používá se pro ověřování totožnosti jméno/heslo
 CONFIG_ROOT_PATH = 'root_path'  # Kořenová složka. Používá se třeba ve FastAPI
 
+CONFIG_CERT = 'cert'
+CONFIG_PATH = 'path'
+
 CONFIG_DOCUMENTS = 'documents'
 CONFIG_FORM = 'form'
 CONFIG_TYPE = 'type'

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2}/sysnet_pyutils/models/general.py

@@ -107,6 +107,19 @@ class CodeValueType(BaseModel):
         self.value = data[1]
         return self
 
+    def __repr__(self):
+        merged_list = [x for x in [self.code, self.value] if x not in [None, '']]
+        if merged_list:
+            return ' '.join(merged_list)
+        return None
+
+    def __str__(self):
+        merged_list = [x for x in [self.code, self.value] if x not in [None, '']]
+        if merged_list:
+            return ' - '.join(merged_list)
+        return ''
+
+
 class RegionalValueType(CodeValueType):
     # kód/hodnota/rok/kraj
     year: Optional[int] = Field(default=None, description='Rok platnotsi položky', examples=[2022])

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2}/sysnet_pyutils/utils.py

@@ -16,7 +16,7 @@ import pytz
 import xmltodict
 import yaml
 
-from sysnet_pyutils.constants import CONFIG_PASSWD
+from sysnet_pyutils.constants import CONFIG_PASSWD, CONFIG_CERT, CONFIG_PATH, CONFIG_PASSWORD
 from sysnet_pyutils.ident import generate_pid, check_pid, correct_pid, generate_id12, PID_PREFIX
 
 TZ = os.getenv('TZ', 'Europe/Prague')
@@ -993,5 +993,10 @@ class Context(LoggedObject, metaclass=Singleton):
                     self.agenda = agenda
                     self.user_name = username
                     self.authenticated = True
+                    if CONFIG_CERT in self.config[agenda]:
+                        if CONFIG_PATH in self.config[agenda][CONFIG_CERT]:
+                            self.cert_file = self.config[agenda][CONFIG_CERT][CONFIG_PATH]
+                        if CONFIG_PASSWORD in self.config[agenda][CONFIG_CERT]:
+                            self.cert_pass = self.config[agenda][CONFIG_CERT][CONFIG_PASSWORD]
                     break
         return self.authenticated

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2/sysnet_pyutils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysnet-pyutils
-Version: 1.4.0
+Version: 1.4.2
 Summary: Python Utilities
 Author-email: Data Developer <info@sysnet.cz>
 Project-URL: Homepage, https://github.com/SYSNET-CZ/pyutils
@@ -14,10 +14,11 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: typing-extensions>=4.12.0
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: pytz>=2023.3
 Requires-Dist: python-dateutil>=2.8.2
-Requires-Dist: xmltodict>=0.13.0
+Requires-Dist: xmltodict>=1.0.0
 Requires-Dist: boto3>=1.34.34
 Requires-Dist: botocore>=1.34.34
 Requires-Dist: pymongo>=4.7.2

{sysnet_pyutils-1.4.0 → sysnet_pyutils-1.4.2}/sysnet_pyutils.egg-info/requires.txt

@@ -1,7 +1,8 @@
+typing-extensions>=4.12.0
 PyYAML>=6.0.1
 pytz>=2023.3
 python-dateutil>=2.8.2
-xmltodict>=0.13.0
+xmltodict>=1.0.0
 boto3>=1.34.34
 botocore>=1.34.34
 pymongo>=4.7.2