qutePandas 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

qutePandas/__init__.py

@@ -1,11 +1,11 @@
-"""
-qutePandas - A pandas-like library for q/kdb+
-"""
-
 import os
+import sys
 
-def _setup_environment():
-    """Validates and sets up the environment for PyKX."""
+def _setup_pykx_environment():
+    """
+    Sets up the environment for PyKX BEFORE any PyKX imports.
+    This must run before importing any module that uses PyKX.
+    """
     root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
     env_path = os.path.join(root, ".env")
     
@@ -20,17 +20,47 @@ def _setup_environment():
                     if len(parts) == 2:
                         key, value = parts
                         value = value.strip().strip('"').strip("'")
+                        # Only set if not already in environment
                         if key.strip() and key.strip() not in os.environ:
                             os.environ[key.strip()] = value
-
+    
+    # Check for valid license files in priority order
     qutepandas_home = os.path.expanduser("~/.qutepandas")
     local_kdb = os.path.join(root, "kdb_lic")
+    
+    license_found = False
+    valid_license_path = None
+    
     if os.path.exists(os.path.join(local_kdb, "kc.lic")):
-        os.environ['QLIC'] = local_kdb
+        valid_license_path = local_kdb
+        license_found = True
     elif os.path.exists(os.path.join(qutepandas_home, "kc.lic")):
-        os.environ['QLIC'] = qutepandas_home
+        valid_license_path = qutepandas_home
+        license_found = True
+    
+    if license_found and valid_license_path:
+        os.environ['QLIC'] = valid_license_path
+        os.environ.pop('PYKX_UNLICENSED', None)
+    elif 'QLIC' in os.environ:
+        qlic_path = os.environ['QLIC']
+        if not (os.path.exists(os.path.join(qlic_path, "kc.lic")) or 
+                os.path.exists(os.path.join(qlic_path, "k4.lic"))):
+            del os.environ['QLIC']
+            if 'QHOME' in os.environ:
+                del os.environ['QHOME']
+            license_found = False
+    
+    if not license_found and 'PYKX_UNLICENSED' not in os.environ:
+        os.environ['PYKX_UNLICENSED'] = 'true'
+    
+    if 'PYKX_RELEASE_GIL' not in os.environ:
+        os.environ['PYKX_RELEASE_GIL'] = 'true'
+    
+    if 'PYKX_ENFORCE_EMBEDDED_IMPORT' not in os.environ:
+        os.environ['PYKX_ENFORCE_EMBEDDED_IMPORT'] = '0'
+
+_setup_pykx_environment()
 
-_setup_environment()
 from .core.dataframe import DataFrame
 from .core.connection import connect, get_license_info, install_license
 from .core.display import py, np, pd, pa, pt, print
@@ -59,4 +89,4 @@ from .introspection.dtypes import dtypes
 
 from .indexing import loc, iloc
 
-__version__ = "1.0.0"
+__version__ = "1.1.2"

qutePandas/apply/apply.py

@@ -2,6 +2,10 @@ import pykx as kx
 import pandas as pd
 from ..utils import _ensure_q_table, _handle_return
 
+_VECTORIZED_AXIS1 = {
+    'sum': '{sum (0^) each value flip x}',
+}
+
 
 def apply(df, func, axis=0, return_type='q'):
     """
@@ -39,7 +43,9 @@ def apply(df, func, axis=0, return_type='q'):
                 return pd.Series(ret) if return_type == 'p' else ret
 
         if isinstance(func, str):
-            if axis == 1:
+            if axis == 1 and func in _VECTORIZED_AXIS1:
+                result = kx.q(_VECTORIZED_AXIS1[func], q_table)
+            elif axis == 1:
                 result = kx.q(f"{{({func}) each x}}", q_table)
             else:
                 result = kx.q(f"{{({func}) each flip x}}", q_table)

qutePandas/cleaning/fillna.py

@@ -2,16 +2,23 @@ import pykx as kx
 import pandas as pd
 from ..utils import _ensure_q_table, _handle_return
 
-def fillna(df, values, return_type='q'):
+def fillna(df, col_or_values, fill_value=None, return_type='q'):
     """
-    Fills null values using a dictionary mapping of columns to fill values.
+    Fills null values in specified columns.
+
+    Can be called in two ways:
+        fillna(df, values_dict, return_type='q')
+        fillna(df, col_name, fill_value, return_type='q')
 
     Parameters
     ----------
     df : pandas.DataFrame or pykx.Table
         Input DataFrame.
-    values : dict
-        Mapping of column names to fill values.
+    col_or_values : str or dict
+        If str, the column name to fill (requires fill_value).
+        If dict, a mapping of column names to fill values.
+    fill_value : scalar, optional
+        The value to fill nulls with when col_or_values is a column name.
     return_type : str, default 'q'
         Desired return type ('p' or 'q').
 
@@ -21,8 +28,14 @@ def fillna(df, values, return_type='q'):
         DataFrame with nulls filled.
     """
     try:
-        if not isinstance(values, dict):
-            raise ValueError("values must be a dictionary")
+        if isinstance(col_or_values, str):
+            if fill_value is None:
+                raise ValueError("fill_value is required when col_or_values is a column name")
+            values = {col_or_values: fill_value}
+        elif isinstance(col_or_values, dict):
+            values = col_or_values
+        else:
+            raise ValueError("col_or_values must be a column name (str) or a dictionary")
 
         q_table = _ensure_q_table(df)
         result = q_table
@@ -33,4 +46,4 @@ def fillna(df, values, return_type='q'):
 
         return _handle_return(result, return_type)
     except Exception as e:
-        raise RuntimeError(f"Failed to fillna: {e}")
+        raise RuntimeError(f"Failed to fillna: {e}")

qutePandas/core/dataframe.py

@@ -1,11 +1,8 @@
 import pykx as kx
 import pandas as pd
-import os
 import atexit
 from ..utils import _handle_return
 
-os.environ['PYKX_ENFORCE_EMBEDDED_IMPORT'] = '0'
-
 def DataFrame(data, columns=None):
     """
     Creates a qutePandas DataFrame (internal pykx Table).

qutePandas/indexing/iloc.py

@@ -22,10 +22,15 @@ def iloc(df, rows=None, cols=None, return_type='q'):
         Subset of the inputs.
     """
     table = _ensure_q_table(df)
-    
+
     count = kx.q("count", table).py()
     all_cols = kx.q("cols", table).py()
-    
+
+    # Track whether we can use the fast sublist path for contiguous row slices
+    _use_sublist = False
+    _slice_start = 0
+    _slice_count = 0
+
     if rows is None:
         row_indices = None
     elif isinstance(rows, int):
@@ -33,7 +38,14 @@ def iloc(df, rows=None, cols=None, return_type='q'):
         if q_rows < 0: q_rows += count
         row_indices = [q_rows]
     elif isinstance(rows, slice):
-        row_indices = list(range(*rows.indices(count)))
+        start, stop, step = rows.indices(count)
+        if step == 1:
+            _use_sublist = True
+            _slice_start = start
+            _slice_count = stop - start
+            row_indices = None  # Not needed — sublist handles it
+        else:
+            row_indices = list(range(start, stop, step))
     else:
         row_indices = list(rows)
         row_indices = [r + count if r < 0 else r for r in row_indices]
@@ -47,27 +59,36 @@ def iloc(df, rows=None, cols=None, return_type='q'):
             target_cols = [all_cols[i] for i in range(*cols.indices(len(all_cols)))]
         else:
             target_cols = [all_cols[i] for i in cols]
-            
-    if row_indices is None and target_cols is None:
+
+    if not _use_sublist and row_indices is None and target_cols is None:
         return _handle_return(table, return_type)
 
-    if row_indices is not None and target_cols is not None:
+    # Fast path: contiguous row slice via q's sublist (no Python list overhead)
+    if _use_sublist:
+        sublist_args = kx.LongVector([_slice_start, _slice_count])
+        if target_cols is not None:
+            syms = kx.SymbolVector(target_cols)
+            cols_dict = kx.q('!', syms, syms)
+            q_res = kx.q('{?[sublist[y;x];();0b;z]}', table, sublist_args, cols_dict)
+        else:
+            q_res = kx.q('{sublist[y;x]}', table, sublist_args)
+    elif row_indices is not None and target_cols is not None:
         q_query = '{?[x y;();0b;z]}'
         syms = kx.SymbolVector(target_cols)
         cols_dict = kx.q('!', syms, syms)
         q_res = kx.q(q_query, table, kx.LongVector(row_indices), cols_dict)
-        
+
     elif row_indices is not None:
         q_query = '{x y}'
         q_res = kx.q(q_query, table, kx.LongVector(row_indices))
-        
+
     elif target_cols is not None:
         q_query = '{?[x;();0b;y]}'
         syms = kx.SymbolVector(target_cols)
         cols_dict = kx.q('!', syms, syms)
         q_res = kx.q(q_query, table, cols_dict)
-        
+
     else:
         q_res = table
 
-    return _handle_return(q_res, return_type)
+    return _handle_return(q_res, return_type)

{qutepandas-1.1.0.dist-info → qutepandas-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qutePandas
-Version: 1.1.0
+Version: 1.1.2
 Summary: A pandas-like library for kdb+/q using pykx
 Home-page: https://ishapatro.github.io/qutePandas/
 Author: Isha Patro

{qutepandas-1.1.0.dist-info → qutepandas-1.1.2.dist-info}/RECORD

@@ -1,22 +1,22 @@
-qutePandas/__init__.py,sha256=BO7UwZvxdpkHzCeXWasLf6mSVx-wOpaBNyXCDlEb_80,2012
+qutePandas/__init__.py,sha256=USg_a44fbQDKf5Ads1vgqyHNqU6AKrVM5eFfEJhLXrc,3143
 qutePandas/utils.py,sha256=X0GODOBxuAFOtjjFb6IGlzjDhhrkwH_6ErIMypiFhUM,1026
 qutePandas/apply/__init__.py,sha256=tdjeqTQI6jH530lTmpd9dkUPese6B22uI2P4ATKoGzc,92
-qutePandas/apply/apply.py,sha256=OqeNwgoD1G5Y6PK7G_2CX7fswq4_Fl0YDDaqWI7O-a4,2275
+qutePandas/apply/apply.py,sha256=5Fa4I7_zkILk0TMJioWoAFh9kgrb-jVI4PMBcjIkWmQ,2465
 qutePandas/apply/apply_col.py,sha256=h6nAsAXLIC4WcMD-amW3bXkaNEe30SgKEBfUr3eKTng,1597
 qutePandas/cleaning/__init__.py,sha256=6tRzTPgCEumZ7c_TvsMit3pRxZhdzf1Pd4y23ozv_2k,204
 qutePandas/cleaning/dropna.py,sha256=SGIPg8vk4PB1jtnH8hDComuMz8omdraJhOPzKTRiUgI,739
 qutePandas/cleaning/dropna_col.py,sha256=hpR4BN-ZuYdz222aUlYKyrEA7QmYomAMqTK6ebVB0ro,831
-qutePandas/cleaning/fillna.py,sha256=NhYlNpHIlFMMd9ws0dKvw1njxUOmuf6VHLo8oQSUpEA,1057
+qutePandas/cleaning/fillna.py,sha256=9PDZCM1hyLtxFkVfQz7NJu1xrjDSW-nPQU47hysfDTI,1689
 qutePandas/cleaning/remove_duplicates.py,sha256=zf6TTbkuSh5S4ZCmgznPLl-erw-umVP7K0EqOyv9wUM,757
 qutePandas/core/__init__.py,sha256=o8WuiBhI5jBqKXTL80kBTNcxZo1aO45dQx2Z6UwWg50,311
 qutePandas/core/connection.py,sha256=CsBWI2jwIO1kNicA42AefmlRgVx5WqayCJPhHzJHhFc,4275
-qutePandas/core/dataframe.py,sha256=bwdm-MVIpoXRo0RblJ_crZVCJlUZgQLN4PmcYu6mdzk,3269
+qutePandas/core/dataframe.py,sha256=ehfz8lMIV_Yj1f9bMpY25TH3EMbR02Dvji9lhGg395E,3209
 qutePandas/core/display.py,sha256=ubSZM8yf0kARuiSXpUHJ0WmIt4syjkp-VuV2NAXbiGc,5058
 qutePandas/grouping/__init__.py,sha256=GOBRAWDuh3PnKHEVDzmEqoG_GIfU4G6Gtk0aeSG92lE,116
 qutePandas/grouping/groupby_avg.py,sha256=F8Gc6XdOKiWyNKOoDURgYeeIxIduzbds2mHCfxEtvw4,1129
 qutePandas/grouping/groupby_sum.py,sha256=9XZ2tITeCMRtdnpwH2CpoQh3Y3NDC-ufwiDg6EQUJOA,1128
 qutePandas/indexing/__init__.py,sha256=2MmNlO54FOdIaaPSzegum3QmeO-Ts8ya3xSCodQjTIo,45
-qutePandas/indexing/iloc.py,sha256=g-fG0pxYHn7_qrBwDQ3MRsTi-U_VEtrN4_z5kDNmZaM,2272
+qutePandas/indexing/iloc.py,sha256=g0LYKZAqdVk6Xz--RUdb-VtECnzFRET28qh6KL5SRgE,3117
 qutePandas/indexing/loc.py,sha256=Xn_043CrKyJBTXhRUYWtU0ZF1yikIGxTI0gTJAYIEfA,1511
 qutePandas/introspection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qutePandas/introspection/dtypes.py,sha256=h3qImsu3JBuELp2zeIfwyOlFTsC513U_qSRNuYzeXWw,705
@@ -29,7 +29,7 @@ qutePandas/transformation/__init__.py,sha256=ECPmFXZq-uh5ajkgAVQbdc8flVzrcwkhEqw
 qutePandas/transformation/cast.py,sha256=VD8D0gPs9GJX52bqu_LKt7BHU69Iv-scOq-E2Q_MGQU,2226
 qutePandas/transformation/drop_col.py,sha256=4hdGjitDbYSfxj-4jo73NmTa2qKed-NjGj0jGBfiANY,1509
 qutePandas/transformation/rename.py,sha256=MwWjbhaZCUdQgkObaMPIB8fUY240x_EdD41cwszCa4o,948
-qutepandas-1.1.0.dist-info/METADATA,sha256=-8cJlJSnucXHNZMShlp5osW2NzdJvg2jcntF-qVsbXE,2540
-qutepandas-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qutepandas-1.1.0.dist-info/top_level.txt,sha256=O_6KkoxW8KjgZX5o7sYwYVb8XPtNBA7PRSTE08qda1k,11
-qutepandas-1.1.0.dist-info/RECORD,,
+qutepandas-1.1.2.dist-info/METADATA,sha256=C49oFk4j_KXUAABQfcYnZeSJaxmBKhly2t_Cv_aaF_Y,2540
+qutepandas-1.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+qutepandas-1.1.2.dist-info/top_level.txt,sha256=O_6KkoxW8KjgZX5o7sYwYVb8XPtNBA7PRSTE08qda1k,11
+qutepandas-1.1.2.dist-info/RECORD,,

{qutepandas-1.1.0.dist-info → qutepandas-1.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any