lukhed-basic-utils 1.4.4__tar.gz → 1.4.6__tar.gz

{lukhed_basic_utils-1.4.4 → lukhed_basic_utils-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lukhed_basic_utils
-Version: 1.4.4
+Version: 1.4.6
 Summary: A collection of basic utility functions
 Home-page: https://github.com/lukhed/lukhed_basic_utils
 Author: lukhed

{lukhed_basic_utils-1.4.4 → lukhed_basic_utils-1.4.6}/lukhed_basic_utils/githubCommon.py

@@ -345,7 +345,16 @@ class GithubHelper:
             return None
 
         if decode:
-            decoded = contents.decoded_content
+            if contents.encoding == "base64":
+                decoded = contents.decoded_content
+            elif contents.download_url:
+                # For large files, use the download URL to fetch the file content
+                response = rC.make_request(contents.download_url)
+                response.raise_for_status()  # Ensure we notice bad responses
+                decoded = response.content
+            else:
+                raise ValueError(f"Unexpected file encoding: {contents.encoding}")
+        
             if '.json' in repo_path:
                 return json.loads(decoded)
             else:
@@ -533,7 +542,8 @@ class GithubHelper:
 
         
 class KeyManager(GithubHelper):
-    def __init__(self, key_name, config_file_preference='local', github_config_dir=None, provide_key_data=None):
+    def __init__(self, key_name, config_file_preference='local', github_config_dir=None, provide_key_data=None, 
+                 force_setup=False):
         """
         This class manages api key storage and retrieval from new api creation through continued use. 
         There are two options for storage set by the config_file_preference parameter:
@@ -569,11 +579,14 @@ class KeyManager(GithubHelper):
             (instead of going through the guided setup where you paste the key). This is helpful for complex keys 
             that require more than one token or that have additional meta data with them. Two options:
             dict or the full path str to the file that contains the json.
+        force_setup : bool, optional
+            If True, will force the setup to occur and skip y/n prompts. Defaults to False.
         """
 
         self._config_dict = {}
         self._config_type = config_file_preference.lower()
         self._provided_key_data = provide_key_data
+        self._force_setup = force_setup
 
         # Key name and file based on parameters
         self.key_name = key_name
@@ -626,21 +639,32 @@ class KeyManager(GithubHelper):
             return False
         
     def _guided_api_key_setup(self):
-        confirm = input((f"You don't have a key stored for '{self.key_name}'. Do you want to go through setup? (y/n)"))
-        if confirm != 'y':
-            print("OK, Exiting...")
-            quit()
+        if self._force_setup:
+            pass
+        else:
+            confirm = input((f"You don't have a key stored for '{self.key_name}'. " 
+                              "Do you want to go through setup? (y/n)"))
+            if confirm != 'y':
+                print("OK, Exiting...")
+                quit()
 
         if self._config_type == 'github':
-            input(("\n1. Starting setup\n"
-                f"The key for '{self.key_name}' you provide in this setup will be stored on your private github repo: "
-                f"'{self._gh_repo}/{self.key_file_name}'"
-                "\nPress enter to continue"))
+            if self._provided_key_data:
+                pass
+            else:
+                input(("\n1. Starting setup\n"
+                    f"The key for '{self.key_name}' you provide in this setup will be stored on your "
+                    "private github repo: "
+                    f"'{self._gh_repo}/{self.key_file_name}'"
+                    "\nPress enter to continue"))
         elif self._config_type == 'local':
-            input(("\n1. Starting setup\n"
-                f"The key for '{self.key_name}' you provide in this setup will be stored locally at: "
-                f"{self._local_key_storage} "
-                "\nPress enter to continue"))
+            if self._provided_key_data:
+                pass
+            else:
+                input(("\n1. Starting setup\n"
+                    f"The key for '{self.key_name}' you provide in this setup will be stored locally at: "
+                    f"{self._local_key_storage} "
+                    "\nPress enter to continue"))
         else:
             print(f"ERROR: '{self._config_type}' is not a valid config_file_preference")
             quit()

{lukhed_basic_utils-1.4.4 → lukhed_basic_utils-1.4.6}/lukhed_basic_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lukhed-basic-utils
-Version: 1.4.4
+Version: 1.4.6
 Summary: A collection of basic utility functions
 Home-page: https://github.com/lukhed/lukhed_basic_utils
 Author: lukhed

{lukhed_basic_utils-1.4.4 → lukhed_basic_utils-1.4.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="lukhed_basic_utils",
-    version="1.4.4",
+    version="1.4.6",
     description="A collection of basic utility functions",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",