python-jack-knife 0.6.3__py3-none-any.whl → 0.6.4__py3-none-any.whl

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

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

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.dist-info → python_jack_knife-0.6.4.dist-info}/METADATA

@@ -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.dist-info → python_jack_knife-0.6.4.dist-info}/RECORD

@@ -7,9 +7,9 @@ pjk/man_page.py,sha256=BNxRbzXfvR_5FoPkpCwxApyMsfSSrSdDu2PM-IVblA4,4447
 pjk/parser.py,sha256=2aZiW0SY9KPKb2h4xPasOhxehcxn_l_BEx2swmN_7_E,12673
 pjk/progress.py,sha256=scacaLRbSMBJEEEDeOTYt8sKwXP-CYEGoANG7IXVoQ4,9597
 pjk/registry.py,sha256=0_exY3sivaOHyRtf-v88OSugl2LGAbbFjyFS4cPbGO8,6864
-pjk/version.py,sha256=jHYtVtGKGheAlMNH7SOx-kHkezl8soWe99m0c3Zje2s,91
+pjk/version.py,sha256=smFKtPKnTVCimiTTlUrQYXoyxFS9F6JlapeUCyMHJpY,91
 pjk/integrations/ddb_sink.py,sha256=qFuh0ZkZ1oGrx576-226eu75sauGqa8BF_u-FLs4yW4,1704
-pjk/integrations/opensearch_client.py,sha256=xLSxUq0eu-Pn7Hc4X9aMWqz9DyCaCtTVfTFcDy1nirA,3252
+pjk/integrations/opensearch_client.py,sha256=kpDISpLzGRA5maOf3JfdbOTVxpvSSe2gfzUrE1SVU4I,3250
 pjk/integrations/opensearch_query_pipe.py,sha256=JCb1s0amk7u-MeNXr1di8wY2UTKioHSJKDrthRQYzu0,3526
 pjk/integrations/postgres_pipe.py,sha256=z9xbxvwPg1T4bSln_5r57wWMildwe-gHdpf5Y_G6MmA,6178
 pjk/integrations/snowflake_pipe.py,sha256=JzcjxY4CbXHfVKsURD1ryZqgZfkDDfWJN_AjRcOtFms,8007
@@ -55,7 +55,7 @@ pjk/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pjk/sources/csv_source.py,sha256=Qlk3wB99jQPNIR4yRWmvrpCvGBsc8qcVxjVmtMYPlc0,702
 pjk/sources/dir_source.py,sha256=V8kVrzwSXyAk3bfwCAQA5dzgEFE3HKIuXAdiP_eP7Ls,2474
 pjk/sources/factory.py,sha256=J_cltOaKSE1uAJOyXWzNeoWNqBH2rsLQ2iGApccSUn0,1732
-pjk/sources/format_source.py,sha256=OFLK7lCQN_DckB99FhG_10as1oAy8iCCMWyZ1ArC9P0,4740
+pjk/sources/format_source.py,sha256=Yae2G4sSsKdmFPbxRz68yIPJwxlHBMKojQYUxjradC4,4802
 pjk/sources/inline_source.py,sha256=iskdhxoJ6uzzBZpy-1N2fH0UyJuSATMw7soE_ZRz1Yg,1703
 pjk/sources/json_source.py,sha256=83YG4dsnBErqbp72I3D-_7acJMo6h-H-vQd_PviJxmc,1061
 pjk/sources/lazy_file.py,sha256=fQYaQz7bytG9vY4JNtIQJxfHWFowCn5il51H7vQrTNg,400
@@ -68,9 +68,9 @@ pjk/sources/source_list.py,sha256=5L2vFrtVSl9rKf2NjfpUFOOAb-iypVDKYCw1-3xgcEo,64
 pjk/sources/sql_source.py,sha256=2CpOuikd2BVmMW_UbhVGPfXUf3BJmOcK5yMtmbTMYvw,743
 pjk/sources/tsv_source.py,sha256=37nhEblCZ8XeTNHVo-WcdJ8HbIbiwKgsDES_yzz6EdU,306
 pjk/sources/user_source_factory.py,sha256=0XIz6NkiBhGAteGDP8cNy7MALWsUF3smtLj4Qnj41Q8,1326
-python_jack_knife-0.6.3.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_jack_knife-0.6.3.dist-info/METADATA,sha256=gnD4xhcMsNPLMIuYLGHIUfpjbutJaiQr1NobjBv_KHk,14641
-python_jack_knife-0.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_jack_knife-0.6.3.dist-info/entry_points.txt,sha256=kzZ10zEisvEaG2xYqqw7xRpuV62rAO_dPEHnM6USelk,38
-python_jack_knife-0.6.3.dist-info/top_level.txt,sha256=r-Ef_I9SbVDL9jD-W0WtshstLos_7guWbpItYxxSllQ,4
-python_jack_knife-0.6.3.dist-info/RECORD,,
+python_jack_knife-0.6.4.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_jack_knife-0.6.4.dist-info/METADATA,sha256=x9zWQRClA3ZHnR6ycsh440aCmRn-igSh0XGZG4Xti8I,14641
+python_jack_knife-0.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_jack_knife-0.6.4.dist-info/entry_points.txt,sha256=kzZ10zEisvEaG2xYqqw7xRpuV62rAO_dPEHnM6USelk,38
+python_jack_knife-0.6.4.dist-info/top_level.txt,sha256=r-Ef_I9SbVDL9jD-W0WtshstLos_7guWbpItYxxSllQ,4
+python_jack_knife-0.6.4.dist-info/RECORD,,