klongpy 0.6.6__tar.gz → 0.6.8__tar.gz

{klongpy-0.6.6/klongpy.egg-info → klongpy-0.6.8}/PKG-INFO

@@ -1,29 +1,46 @@
 Metadata-Version: 2.1
 Name: klongpy
-Version: 0.6.6
+Version: 0.6.8
 Summary: High-Performance Klong array language with rich Python integration.
-Home-page: UNKNOWN
 Author: Brian Guarraci
 License: MIT
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: <3.12,>=3.9
+Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
-Provides-Extra: cuda102
-Provides-Extra: cuda110
-Provides-Extra: cuda111
-Provides-Extra: cuda11x
-Provides-Extra: cuda12x
+License-File: LICENSE
+Requires-Dist: numpy~=1.26.4
 Provides-Extra: cupy
-Provides-Extra: db
-Provides-Extra: full
-Provides-Extra: repl
-Provides-Extra: rocm-4-3
+Requires-Dist: cupy; extra == "cupy"
+Provides-Extra: cuda12x
+Requires-Dist: cupy-cuda12x; extra == "cuda12x"
+Provides-Extra: cuda11x
+Requires-Dist: cupy-cuda11x; extra == "cuda11x"
+Provides-Extra: cuda111
+Requires-Dist: cupy-cuda111; extra == "cuda111"
+Provides-Extra: cuda110
+Requires-Dist: cupy-cuda110; extra == "cuda110"
+Provides-Extra: cuda102
+Requires-Dist: cupy-cuda102; extra == "cuda102"
 Provides-Extra: rocm-5-0
+Requires-Dist: cupy-rocm-5-0; extra == "rocm-5-0"
+Provides-Extra: rocm-4-3
+Requires-Dist: cupy-rocm-4-3; extra == "rocm-4-3"
+Provides-Extra: repl
+Requires-Dist: colorama==0.4.6; extra == "repl"
 Provides-Extra: web
+Requires-Dist: aiohttp==3.9.4; extra == "web"
+Provides-Extra: db
+Requires-Dist: pandas==2.2.2; extra == "db"
+Requires-Dist: duckdb==1.0.0; extra == "db"
 Provides-Extra: ws
-License-File: LICENSE
+Requires-Dist: websockets==12.0; extra == "ws"
+Provides-Extra: full
+Requires-Dist: colorama==0.4.6; extra == "full"
+Requires-Dist: aiohttp==3.9.4; extra == "full"
+Requires-Dist: pandas==2.2.2; extra == "full"
+Requires-Dist: duckdb==1.0.0; extra == "full"
+Requires-Dist: websockets==12.0; extra == "full"
 
 
 ![Unit Tests](https://github.com/briangu/klongpy/workflows/Unit%20Tests/badge.svg)
@@ -37,8 +54,6 @@ License-File: LICENSE
 [![Downloads](https://static.pepy.tech/badge/klongpy/month)](https://pepy.tech/project/klongpy)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/klongpy.svg?style=social&label=Follow%20%40KlongPy)](https://twitter.com/klongpy)
-
 # KlongPy: High-Performance Array Programming in Python
 
 KlongPy is a Python adaptation of the [Klong](https://t3x.org/klong) [array language](https://en.wikipedia.org/wiki/Array_programming), known for its high-performance vectorized operations that leverage the power of NumPy. Embracing a "batteries included" philosophy, KlongPy combines built-in modules with Python's expansive ecosystem, facilitating rapid application development with Klong's succinct syntax.
@@ -395,5 +410,3 @@ python3 -m unittest
 # Acknowledgement
 
 HUGE thanks to Nils M Holm for his work on Klong and providing the foundations for this interesting project.
-
-

{klongpy-0.6.6 → klongpy-0.6.8}/README.md

@@ -10,8 +10,6 @@
 [![Downloads](https://static.pepy.tech/badge/klongpy/month)](https://pepy.tech/project/klongpy)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/klongpy.svg?style=social&label=Follow%20%40KlongPy)](https://twitter.com/klongpy)
-
 # KlongPy: High-Performance Array Programming in Python
 
 KlongPy is a Python adaptation of the [Klong](https://t3x.org/klong) [array language](https://en.wikipedia.org/wiki/Array_programming), known for its high-performance vectorized operations that leverage the power of NumPy. Embracing a "batteries included" philosophy, KlongPy combines built-in modules with Python's expansive ecosystem, facilitating rapid application development with Klong's succinct syntax.

{klongpy-0.6.6 → klongpy-0.6.8}/klongpy/core.py

@@ -87,6 +87,12 @@ class KGCond(list):
     pass
 
 
+def safe_inspect(fn, follow_wrapped=True):
+    try:
+        return inspect.signature(fn, follow_wrapped=follow_wrapped).parameters
+    except ValueError:
+        return {"args":[]}
+
 class KGLambda:
     """
     KGLambda wraps a lambda and make it available to Klong, allowing for direct
@@ -109,7 +115,7 @@ class KGLambda:
     """
     def __init__(self, fn, args=None, provide_klong=False, wildcard=False):
         self.fn = fn
-        params = args or inspect.signature(self.fn, follow_wrapped=True).parameters
+        params = args or safe_inspect(fn)
         self.args = [reserved_fn_symbol_map[x] for x in reserved_fn_args if x in params]
         self._provide_klong = provide_klong or 'klong' in params
         self._wildcard = wildcard
@@ -636,6 +642,7 @@ def read_cond(klong, t, i=0):
         i = cexpect(t, i, ';')
         i,n = klong._expr(t, i, ignore_newline=True)
         r.append(n)
+        i = skip(t,i,ignore_newline=True)
         i = cexpect(t, i, ']')
     return i, KGCond(r)
 
@@ -694,9 +701,9 @@ def kg_read(t, i=0, read_neg=False, ignore_newline=False, module=None, list_leve
     if i >= len(t):
         return i, None
     a = t[i]
-    if a in ['\n', ';']:
-        return i+1,';'
-    elif a in ['(',')','{','}',']']:
+    if a == '\n':
+        a = ';' # convert newlines to semicolons
+    if a in [';','(',')','{','}',']']:
         return i+1,a
     elif cmatch2(t, i, '0', 'c'):
         return read_char(t, i)

{klongpy-0.6.6 → klongpy-0.6.8}/klongpy/interpreter.py

@@ -119,7 +119,7 @@ class KlongContext():
                         if dk.startswith(tk):
                             return True
         return False
-    
+
     def __iter__(self):
         seen = set()
         for d in self._context:
@@ -358,6 +358,7 @@ class KlongInterpreter():
         if safe_eq(a, '{'): # read fn
             i,a = self.prog(t, i, ignore_newline=True)
             a = a[0] if len(a) == 1 else a
+            i = skip(t, i, ignore_newline=True)
             i = cexpect(t, i, '}')
             arity = get_fn_arity(a)
             if cmatch(t, i, '(') or cmatch2(t,i,':','('):
@@ -416,6 +417,7 @@ class KlongInterpreter():
             if safe_eq(aa, '{'): # read fn
                 i,aa = self.prog(t, i, ignore_newline=True)
                 aa = aa[0] if len(aa) == 1 else aa
+                i = skip(t, i, ignore_newline=True)
                 i = cexpect(t, i, '}')
                 arity = get_fn_arity(aa)
                 if cmatch(t, i, '(') or cmatch2(t,i,':','('):
@@ -433,6 +435,8 @@ class KlongInterpreter():
                 i, aaa = self._expr(t, i, ignore_newline=ignore_newline)
                 a = KGFn(aa, [a, aaa], arity=2)
             ii, aa = kg_read(t, i, ignore_newline=ignore_newline, module=self.current_module())
+        if ignore_newline and safe_eq(a, '\n'):
+            i = skip(t, i, ignore_newline=True)
         return i, a
 
     def prog(self, t, i=0, ignore_newline=False):
@@ -481,12 +485,12 @@ class KlongInterpreter():
         - f_args is the list of arguments provided to the function during the current invocation.
         - f.args (if f is an instance of KGFn) represents predefined arguments associated with the function.
         These are arguments that are already set by virtue of the function being a projection of another function.
-        - During the resolution process, if the function f is a KGFn with predefined arguments (projections), 
+        - During the resolution process, if the function f is a KGFn with predefined arguments (projections),
         these arguments are appended to the f_args list.
-        - The resolution process ensures that if there are placeholders in the predefined arguments, they are 
+        - The resolution process ensures that if there are placeholders in the predefined arguments, they are
         filled in with values from the provided arguments. However, if the function itself is being projected,
         f_args can still contain a None indicating an empty projection slot.
-        - By the end of the resolution, f_args contains the arguments that will be passed to the function for 
+        - By the end of the resolution, f_args contains the arguments that will be passed to the function for
         evaluation. It is possible for f_args to finally contain None if the function is itself being projected.
         - If `f.a` (the main function or symbol) resolves to another function `_f`, it might indicate a higher-order function scenario.
         - In such a case, `f_args` supplies a function as an argument to `f.a`.

{klongpy-0.6.6 → klongpy-0.6.8}/klongpy/sys_fn.py

@@ -13,7 +13,7 @@ import numpy
 
 from .core import (KGChannel, KGChannelDir, KGLambda, KGSym, KlongException,
                    is_dict, is_empty, is_list, kg_asarray, kg_read, kg_write, np,
-                   reserved_fn_args, reserved_fn_symbol_map, safe_eq)
+                   reserved_fn_args, reserved_fn_symbol_map, safe_eq, safe_inspect)
 
 
 def eval_sys_append_channel(x):
@@ -341,7 +341,7 @@ def _handle_import(item):
             if n_args <= len(reserved_fn_args):
                 item = KGLambda(item, args=reserved_fn_args[:n_args])
         else:
-            args = inspect.signature(item, follow_wrapped=True).parameters
+            args = safe_inspect(item, follow_wrapped=True)
             if 'args' in args:
                 item = KGLambda(item, args=None, wildcard=True)
                 n_args = 3

{klongpy-0.6.6 → klongpy-0.6.8/klongpy.egg-info}/PKG-INFO

@@ -1,29 +1,46 @@
 Metadata-Version: 2.1
 Name: klongpy
-Version: 0.6.6
+Version: 0.6.8
 Summary: High-Performance Klong array language with rich Python integration.
-Home-page: UNKNOWN
 Author: Brian Guarraci
 License: MIT
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: <3.12,>=3.9
+Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
-Provides-Extra: cuda102
-Provides-Extra: cuda110
-Provides-Extra: cuda111
-Provides-Extra: cuda11x
-Provides-Extra: cuda12x
+License-File: LICENSE
+Requires-Dist: numpy~=1.26.4
 Provides-Extra: cupy
-Provides-Extra: db
-Provides-Extra: full
-Provides-Extra: repl
-Provides-Extra: rocm-4-3
+Requires-Dist: cupy; extra == "cupy"
+Provides-Extra: cuda12x
+Requires-Dist: cupy-cuda12x; extra == "cuda12x"
+Provides-Extra: cuda11x
+Requires-Dist: cupy-cuda11x; extra == "cuda11x"
+Provides-Extra: cuda111
+Requires-Dist: cupy-cuda111; extra == "cuda111"
+Provides-Extra: cuda110
+Requires-Dist: cupy-cuda110; extra == "cuda110"
+Provides-Extra: cuda102
+Requires-Dist: cupy-cuda102; extra == "cuda102"
 Provides-Extra: rocm-5-0
+Requires-Dist: cupy-rocm-5-0; extra == "rocm-5-0"
+Provides-Extra: rocm-4-3
+Requires-Dist: cupy-rocm-4-3; extra == "rocm-4-3"
+Provides-Extra: repl
+Requires-Dist: colorama==0.4.6; extra == "repl"
 Provides-Extra: web
+Requires-Dist: aiohttp==3.9.4; extra == "web"
+Provides-Extra: db
+Requires-Dist: pandas==2.2.2; extra == "db"
+Requires-Dist: duckdb==1.0.0; extra == "db"
 Provides-Extra: ws
-License-File: LICENSE
+Requires-Dist: websockets==12.0; extra == "ws"
+Provides-Extra: full
+Requires-Dist: colorama==0.4.6; extra == "full"
+Requires-Dist: aiohttp==3.9.4; extra == "full"
+Requires-Dist: pandas==2.2.2; extra == "full"
+Requires-Dist: duckdb==1.0.0; extra == "full"
+Requires-Dist: websockets==12.0; extra == "full"
 
 
 ![Unit Tests](https://github.com/briangu/klongpy/workflows/Unit%20Tests/badge.svg)
@@ -37,8 +54,6 @@ License-File: LICENSE
 [![Downloads](https://static.pepy.tech/badge/klongpy/month)](https://pepy.tech/project/klongpy)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/klongpy.svg?style=social&label=Follow%20%40KlongPy)](https://twitter.com/klongpy)
-
 # KlongPy: High-Performance Array Programming in Python
 
 KlongPy is a Python adaptation of the [Klong](https://t3x.org/klong) [array language](https://en.wikipedia.org/wiki/Array_programming), known for its high-performance vectorized operations that leverage the power of NumPy. Embracing a "batteries included" philosophy, KlongPy combines built-in modules with Python's expansive ecosystem, facilitating rapid application development with Klong's succinct syntax.
@@ -395,5 +410,3 @@ python3 -m unittest
 # Acknowledgement
 
 HUGE thanks to Nils M Holm for his work on Klong and providing the foundations for this interesting project.
-
-

{klongpy-0.6.6 → klongpy-0.6.8}/klongpy.egg-info/requires.txt

@@ -19,15 +19,15 @@ cupy-cuda12x
 cupy
 
 [db]
-duckdb==0.9.2
-pandas==2.2.0
+pandas==2.2.2
+duckdb==1.0.0
 
 [full]
-aiohttp==3.8.5
 colorama==0.4.6
-duckdb==0.9.2
-pandas==2.2.0
-websockets==11.0.3
+aiohttp==3.9.4
+pandas==2.2.2
+duckdb==1.0.0
+websockets==12.0
 
 [repl]
 colorama==0.4.6
@@ -39,7 +39,7 @@ cupy-rocm-4-3
 cupy-rocm-5-0
 
 [web]
-aiohttp==3.8.5
+aiohttp==3.9.4
 
 [ws]
-websockets==11.0.3
+websockets==12.0

{klongpy-0.6.6 → klongpy-0.6.8}/setup.py

@@ -16,9 +16,9 @@ extra_requires = {
         'rocm-5-0': ["cupy-rocm-5-0"],
         'rocm-4-3': ["cupy-rocm-4-3"],
         'repl': ["colorama==0.4.6"],
-        'web': ["aiohttp==3.8.5"],
-        'db': ["pandas==2.2.0","duckdb==0.9.2"],
-        'ws': ["websockets==11.0.3"],
+        'web': ["aiohttp==3.9.4"],
+        'db': ["pandas==2.2.2","duckdb==1.0.0"],
+        'ws': ["websockets==12.0"],
     }
 
 # full feature set extras
@@ -27,7 +27,7 @@ extra_requires['full'] = extra_requires['repl'] + extra_requires['web'] + extra_
 setup(
     name='klongpy',
     packages=find_packages(),
-    version='0.6.6',
+    version='0.6.8',
     description='High-Performance Klong array language with rich Python integration.',
     author='Brian Guarraci',
     license='MIT',
@@ -38,7 +38,7 @@ setup(
         "License :: OSI Approved :: MIT License"
     ],
     install_requires=['numpy~=1.26.4'],
-    python_requires='<3.12,>=3.9',
+    python_requires='<3.13,>=3.9',
     extras_require=extra_requires,
     include_package_data=True,
     zip_safe=False,