python-jack-knife 0.6.3__tar.gz → 0.6.4__tar.gz

{python_jack_knife-0.6.3/src/python_jack_knife.egg-info → python_jack_knife-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jack-knife
-Version: 0.6.3
+Version: 0.6.4
 Summary: Python Jack Knife – a command line data processor
 Author-email: Mike Schultz <mike.schultz@gmail.com>
 License: 

{python_jack_knife-0.6.3 → python_jack_knife-0.6.4}/src/pjk/integrations/opensearch_client.py

@@ -4,17 +4,17 @@ class OpenSearchClient:
 
     @classmethod
     def get_client(cls, config: Config):
-        aws_auth = config.lookup("os_auth_use_aws", "true") != "false"
+        aws_auth = config.lookup("os_auth_use_aws", "true") == 'true'
         scheme = config.lookup("os_scheme", "https")
-        verify_certs = config.lookup("os_verify_certs", "true") != "false"
+        verify_certs = config.lookup("os_verify_certs", "true") == 'true'
         ca_certs = config.lookup("os_ca_certs", None)
         region = config.lookup("os_region", None)
         service = config.lookup("os_service", "es")
         username = config.lookup("os_username", None)
         password = config.lookup("os_password", None)
         timeout = float(config.lookup("os_timeout", 30))
-        ssl_assert_hostname = config.lookup("os_ssl_assert_hostname", "true") != "false"
-        ssl_show_warn = config.lookup("os_ssl_show_warn", "false") == "true"
+        ssl_assert_hostname = config.lookup("os_ssl_assert_hostname", "true") == 'true'
+        ssl_show_warn = config.lookup("os_ssl_show_warn", "false") == 'true'
         host = config.lookup("os_host", None)
         port = config.lookup("os_port", None)
 
@@ -74,4 +74,5 @@ class OpenSearchClient:
             timeout=timeout,
             connection_class=connection_class,
         )
+
         return client

{python_jack_knife-0.6.3 → python_jack_knife-0.6.4}/src/pjk/sources/format_source.py

@@ -60,9 +60,9 @@ class FormatSource(Source):
         """
 
         pattern = re.compile(
-            r'^(?:(?P<pre_colon>[^:]+):)?'            # optional precolon
-            r'(?P<path>[^:]+?)'                      # main path
-            r'(?:\.(?P<ext>\w+(?:\.gz)?))?$'         # optional extension, e.g. json, csv, json.gz
+            r'^(?:(?P<pre_colon>[^:]+):)?'     # take everything up to the first colon (if any)
+            r'(?P<path>.+?)'                   # then the rest of the path, allowing colons
+            r'(?:\.(?P<ext>[A-Za-z0-9]+(?:\.gz)?))?$'  # optional .json / .csv / .json.gz etc., at the very end
         )
 
         # we don't use framework token parsing (except for params) cuz too complicated

{python_jack_knife-0.6.3 → python_jack_knife-0.6.4}/src/pjk/version.py

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

{python_jack_knife-0.6.3 → python_jack_knife-0.6.4/src/python_jack_knife.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jack-knife
-Version: 0.6.3
+Version: 0.6.4
 Summary: Python Jack Knife – a command line data processor
 Author-email: Mike Schultz <mike.schultz@gmail.com>
 License: