dtPyAppFramework 1.0__tar.gz → 1.2__tar.gz

{dtPyAppFramework-1.0/src/dtPyAppFramework.egg-info → dtpyappframework-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtPyAppFramework
-Version: 1.0
+Version: 1.2
 Summary: A Python library for common features in application development.
 Author-email: Digital-Thought <dev@digital-thought.org>
 Maintainer-email: Digital-Thought <dev@digital-thought.org>
@@ -54,6 +54,7 @@ Requires-Dist: colorlog
 Requires-Dist: psutil
 Requires-Dist: pybase64
 Requires-Dist: boto3
+Requires-Dist: cryptography==39.0.2
 Requires-Dist: azure-identity
 Requires-Dist: azure-keyvault-secrets
 Requires-Dist: pykeystore
@@ -88,7 +89,7 @@ The **`AbstractApp`** class serves as a base class for creating Python applicati
 
 To create a simple Python application using dtPyAppFramework:
 ```python
-from dtPyAppFramework.app import AbstractApp
+from dtPyAppFramework.application import AbstractApp
 from dtPyAppFramework import settings
 
 import logging

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/README.md

@@ -25,7 +25,7 @@ The **`AbstractApp`** class serves as a base class for creating Python applicati
 
 To create a simple Python application using dtPyAppFramework:
 ```python
-from dtPyAppFramework.app import AbstractApp
+from dtPyAppFramework.application import AbstractApp
 from dtPyAppFramework import settings
 
 import logging

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/requirements.txt

@@ -3,6 +3,7 @@ colorlog
 psutil
 pybase64
 boto3
+cryptography==39.0.2
 azure-identity
 azure-keyvault-secrets
 pykeystore

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/__init__.py

@@ -1,7 +1,9 @@
-from application import AbstractApp
+import os
+
+dir_path = os.path.dirname(os.path.realpath(__file__))
 
 # Define module-level variables with version-related information
-with open('version.dat', 'r') as _version:
+with open(os.path.join(dir_path, 'version.dat'), 'r') as _version:
     __version__ = _version.read()
 
 

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/application.py

@@ -97,8 +97,9 @@ class AbstractApp(object):
             arg_parser (ArgumentParser): The ArgumentParser object for defining command-line arguments.
         """
         # Common arguments for various states
-        arg_parser.add_argument('--password', action='store', type=str, required=False,
-                                help="Secrets Store password")
+        arg_parser.add_argument('--init', action='store_true', required=False, help='Initialise environment')
+        arg_parser.add_argument('--add_secret', action='store_true', required=False, help='Add secret to store')
+        arg_parser.add_argument('--run', action='store_true', required=False, help='Run Processor')
 
         # Check specific states and add corresponding arguments
         opts, rem_args = arg_parser.parse_known_args()

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/misc/__init__.py

@@ -6,7 +6,7 @@ from shlex import quote as shlex_quote
 def run_cmd(cmd):
     try:
         # Execute the command, capturing the output and raising an exception if the command fails
-        result = subprocess.run(shlex_quote(cmd), shell=True, capture_output=True, check=True, encoding="utf-8")
+        result = subprocess.run(cmd, shell=True, capture_output=True, check=True, encoding="utf-8")
 
         # Return the stripped standard output
         return result.stdout.strip()

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/process/__init__.py

@@ -84,6 +84,8 @@ class ProcessManager():
                                                                spawned_process=True,
                                                                job_id=job_id, worker_id=worker_id,
                                                                parent_log_path=parent_log_path)
+                self.application_settings.init_settings_readers()
+                self.application_settings.secret_manager.load_cloud_stores()
 
                 self.__initialise_stdout_capt__()
 
@@ -94,6 +96,7 @@ class ProcessManager():
 
                 self.load_config()
 
+
         except Exception as ex:
             logging.exception(ex)
             if not self.console_app:
@@ -127,7 +130,7 @@ class ProcessManager():
                 self.application_settings = settings.Settings(application_paths=self.application_paths)
                 self.resource_manager = resources.ResourceManager(application_paths=self.application_paths)
                 self.log_path = app_logging.initialise_logging(redirect_console=not self.console_app)
-
+                self.application_settings.init_settings_readers()
                 self.application_settings.secret_manager.load_cloud_stores()
                 self.__initialise_stdout_capt__()
 
@@ -139,6 +142,7 @@ class ProcessManager():
                     print(f'Log Path: {self.log_path}')
                     self.multiprocessing_manager.set_log_path(self.log_path)
                 args = arg_parser.parse_args()
+
                 if args.add_secret:
                     self.__add_secret__(args)
                 else:

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/settings/secrets/__init__.py

@@ -108,9 +108,12 @@ class SecretsManager(object):
         if key.startswith("Secret#"):
             elements = key.split("#")
             store_name = elements[1]
+        else:
+            elements = key.split(".")
+            store_name = elements[0]
 
         for store in self.stores:
-            if store_name and store_name == store.store_name():
+            if store_name and store_name == store.store_name:
                 value = store.get_secret(key, None)
                 break
             elif not store_name:

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/settings/secrets/aws_secret_store.py

@@ -1,3 +1,5 @@
+import json
+
 from .secret_store import AbstractSecretStore, SecretsStoreException
 from shutil import which
 from ...misc import run_cmd
@@ -45,6 +47,8 @@ class AWSSecretsStore(AbstractSecretStore):
 
         self.aws_session = None
 
+        self.secret_name = self.get_store_setting('secret_name')
+
         # Initialize AWS session based on profile type
         if self.aws_profile == 'key':
             aws_access_key_id = self.get_store_setting('aws_access_key_id')
@@ -72,6 +76,8 @@ class AWSSecretsStore(AbstractSecretStore):
         except Exception as ex:
             raise SecretsStoreException(f'AWS Secrets Store, Not Available. Error: {str(ex)}')
 
+        logging.info(f'Initialised AWS Secrets Manager {store_name}')
+
     def get_secret(self, key, default_value=None):
         """
         Get a secret from the AWS Secrets Manager.
@@ -84,9 +90,23 @@ class AWSSecretsStore(AbstractSecretStore):
             Secret value if found, else default_value.
         """
         try:
-            entry = self.aws_secretsmanager.get_secret_value(SecretId=key)['SecretString']
+            if self.secret_name is not None:
+                entry = self.aws_secretsmanager.get_secret_value(SecretId=self.secret_name)['SecretString']
+            else:
+                entry = self.aws_secretsmanager.get_secret_value(SecretId=key)['SecretString']
+            if entry.startswith('{'):
+                entry = json.loads(entry)
+
+            if len(key.split('.')) == 0:
+                return entry
+            elif len(key.split('.')) == 2:
+                return entry[key.split('.')[1]]
+            elif len(key.split('.')) == 1 and key == self.store_name:
+                return entry
+            else:
+                raise SecretsStoreException(f'Unrecognised AWS Key of secret {key}')
         except Exception as ex:
-            logging.error(str(ex))
+            logging.error(f'{str(ex)} KEY: {key}')
             entry = None
 
         if not entry:

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework/settings/secrets/local_secret_store.py

@@ -1,17 +1,16 @@
 import os
 import sys
-import subprocess
 import logging
 import re
 import pybase64
 
 from .secret_store import AbstractSecretStore, SecretsStoreException
-from pykeepass import PyKeePass
 from itertools import cycle
 from ...misc import run_cmd
 import pykeystore
 from base64 import urlsafe_b64encode
 
+
 class LocalSecretStore(AbstractSecretStore):
     """
     A class representing a local secret store for managing secrets.

dtpyappframework-1.2/src/dtPyAppFramework/version.dat

@@ -0,0 +1 @@
+1.2

{dtPyAppFramework-1.0 → dtpyappframework-1.2/src/dtPyAppFramework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtPyAppFramework
-Version: 1.0
+Version: 1.2
 Summary: A Python library for common features in application development.
 Author-email: Digital-Thought <dev@digital-thought.org>
 Maintainer-email: Digital-Thought <dev@digital-thought.org>
@@ -54,6 +54,7 @@ Requires-Dist: colorlog
 Requires-Dist: psutil
 Requires-Dist: pybase64
 Requires-Dist: boto3
+Requires-Dist: cryptography==39.0.2
 Requires-Dist: azure-identity
 Requires-Dist: azure-keyvault-secrets
 Requires-Dist: pykeystore
@@ -88,7 +89,7 @@ The **`AbstractApp`** class serves as a base class for creating Python applicati
 
 To create a simple Python application using dtPyAppFramework:
 ```python
-from dtPyAppFramework.app import AbstractApp
+from dtPyAppFramework.application import AbstractApp
 from dtPyAppFramework import settings
 
 import logging

{dtPyAppFramework-1.0 → dtpyappframework-1.2}/src/dtPyAppFramework.egg-info/requires.txt

@@ -3,6 +3,7 @@ colorlog
 psutil
 pybase64
 boto3
+cryptography==39.0.2
 azure-identity
 azure-keyvault-secrets
 pykeystore

dtPyAppFramework-1.0/src/dtPyAppFramework/version.dat

@@ -1 +0,0 @@
-1.0