python-jack-knife 0.7.5__tar.gz → 0.7.6__tar.gz

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jack-knife
-Version: 0.7.5
+Version: 0.7.6
 Summary: Python Jack Knife – a command line data processor
 Author-email: Mike Schultz <mike.schultz@gmail.com>
 License: 
@@ -226,6 +226,9 @@ Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: opensearch-py; extra == "dev"
 Provides-Extra: all
 Requires-Dist: boto3>=1.34; extra == "all"
 Requires-Dist: pg8000>=1.30.0; extra == "all"

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/pyproject.toml

@@ -25,7 +25,7 @@ aws = ["boto3>=1.34"]
 postgres = ["pg8000>=1.30.0"]
 parquet = ["pyarrow>=15.0.0"]
 plot = ["matplotlib>=3.9.0", "pandas>=2.2.0"]
-dev = ["pytest", "black", "ruff"]
+dev = ["pytest", "black", "ruff", "build", "twine", "opensearch-py"]
 all = [
   "boto3>=1.34",
   "pg8000>=1.30.0",

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/src/pjk/integrations/opensearch_client.py

@@ -2,20 +2,20 @@ from pjk.usage import Usage
 
  # name, type, default
 OS_CONFIG_TUPLES = [
-    ("default_index", str, None),
+    ("default_index", str, None, True),
     ("os_auth_use_aws", bool, "true"),
     ("os_scheme", str, "https"),
     ("os_verify_certs", bool, "true"),
-    ("os_ca_certs", str, None),
-    ("os_region", str, None),
+    ("os_ca_certs", str, None, True),
+    ("os_region", str, None, True),
     ("os_service", str, "es"),
-    ("os_username", str, None),
-    ("os_password", str, None),
+    ("os_username", str, None, True),
+    ("os_password", str, None, True),
     ("os_timeout", float, 30),
     ("os_ssl_assert_hostname", bool, "true"),
     ("os_ssl_show_warn", bool, "false"),
     ("os_host", str, None),
-    ("os_port", int, None)
+    ("os_port", int, None, True),
 ]
 
 class OpenSearchClient:

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/src/pjk/usage.py

@@ -3,6 +3,7 @@ import os
 import yaml
 
 CONFIG_FILE = '~/.pjk/configs.yaml'
+EXTENDS_KEY = '_extends'
 
 class Config:
     def __init__(self):
@@ -17,6 +18,43 @@ class Config:
         else:
             self._data = {}
 
+    def _extends_hint(self, instance_key: str) -> str:
+        entry = self._data.get(instance_key) or {}
+        base_key = entry.get(EXTENDS_KEY)
+        if not base_key:
+            return ""
+        return f" ('{instance_key}' {EXTENDS_KEY}: '{base_key}')"
+
+    def _resolve_entry(self, instance_key: str, visiting: Optional[Set[str]] = None) -> dict:
+        entry = self._data.get(instance_key)
+        if entry is None:
+            return None
+
+        base_key = entry.get(EXTENDS_KEY)
+        if not base_key:
+            return entry
+
+        if visiting is None:
+            visiting = set()
+        if instance_key in visiting:
+            raise TokenError(
+                f"Cycle in {CONFIG_FILE} config inheritance involving '{instance_key}'."
+            )
+        visiting.add(instance_key)
+
+        base_entry = self._resolve_entry(base_key, visiting)
+        if base_entry is None:
+            raise TokenError(
+                f"'{instance_key}:{EXTENDS_KEY}' in {CONFIG_FILE} points to a non-existent entry: '{base_key}'. "
+                f"Add '{base_key}' or define params directly on '{instance_key}'."
+            )
+
+        merged = dict(base_entry)
+        for key, value in entry.items():
+            if key != EXTENDS_KEY:
+                merged[key] = value
+        return merged
+
     def lookup(self, usage: "Usage", param: str):
          # this should be advertised as a well-known requirement: usage must define a 'instance' arg
         instance = usage.get_arg("instance")
@@ -32,7 +70,7 @@ class Config:
         if not type_default:
             raise TokenError(f"{class_name} does not define '{param}' in config_tuples")
 
-        (param_type, param_default) = type_default
+        (param_type, param_default, optional) = type_default
 
         instance_key = f'{class_name}-{instance}'
         entry = self._data.get(instance_key, None)
@@ -41,15 +79,18 @@ class Config:
                 f"{CONFIG_FILE} does not contain entry for '{instance_key}' with required params."
             )
         
-        _alias = entry.get('_alias', None) # _alias must = another entry instance_key
-        if _alias:
-            entry = self._data.get(_alias, None)
-            if not entry:
+        resolved = self._resolve_entry(instance_key)
+
+        if param not in resolved and not optional and param_default is None:
+            hint = self._extends_hint(instance_key)
+            if hint:
+                base_key = entry.get(EXTENDS_KEY)
                 raise TokenError(
-                    f"'{instance_key}:_alias' in {CONFIG_FILE} points to a non-existent entry: '{_alias}'."
-                )    
-        
-        raw = entry.get(param, param_default)
+                    f"'{param}' missing from '{instance_key}' in {CONFIG_FILE}{hint}. "
+                    f"Set it on '{base_key}' or override it on '{instance_key}'."
+                )
+
+        raw = resolved.get(param, param_default)
 
         if not raw:
             return None
@@ -171,7 +212,15 @@ class Usage:
         self.config_tuples = tuples
 
     def get_config_tuples(self) -> dict:
-        return {n: (t, d) for n, t, d in self.config_tuples}
+        result = {}
+        for t in self.config_tuples:
+            if len(t) == 3:
+                name, param_type, default = t
+                optional = False
+            else:
+                name, param_type, default, optional = t
+            result[name] = (param_type, default, optional)
+        return result
 
     # args and param values default as str
     def def_arg(self, name: str, usage: str, is_num: bool = False, valid_values: Optional[Set[str]] = None):

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/src/pjk/version.py

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2024 Mike Schultz
 
-__version__ = "0.7.5"
+__version__ = "0.7.6"

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/src/python_jack_knife.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jack-knife
-Version: 0.7.5
+Version: 0.7.6
 Summary: Python Jack Knife – a command line data processor
 Author-email: Mike Schultz <mike.schultz@gmail.com>
 License: 
@@ -226,6 +226,9 @@ Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: opensearch-py; extra == "dev"
 Provides-Extra: all
 Requires-Dist: boto3>=1.34; extra == "all"
 Requires-Dist: pg8000>=1.30.0; extra == "all"

{python_jack_knife-0.7.5 → python_jack_knife-0.7.6}/src/python_jack_knife.egg-info/requires.txt

@@ -20,6 +20,9 @@ boto3>=1.34
 pytest
 black
 ruff
+build
+twine
+opensearch-py
 
 [parquet]
 pyarrow>=15.0.0