velocity-python 0.0.103__tar.gz → 0.0.105__tar.gz

{velocity_python-0.0.103/src/velocity_python.egg-info → velocity_python-0.0.105}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.103
+Version: 0.0.105
 Summary: A rapid application development library for interfacing with data storage
-Author-email: Velocity Team <contact@example.com>
-License: MIT
+Author-email: Velocity Team <info@codeclubs.org>
+License-Expression: MIT
 Project-URL: Homepage, https://codeclubs.org/projects/velocity
 Keywords: database,orm,sql,rapid-development,data-storage
 Classifier: Development Status :: 3 - Alpha
@@ -16,7 +16,6 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
@@ -146,6 +145,58 @@ pip install velocity-python[sqlserver]
 pip install velocity-python[all]
 ```
 
+## Project Structure
+
+```
+velocity-python/
+├── src/velocity/           # Main package source code
+├── tests/                  # Test suite
+├── scripts/                # Utility scripts and demos
+│   ├── run_tests.py       # Test runner script
+│   ├── bump.py            # Version management
+│   ├── demo_*.py          # Demo scripts
+│   └── README.md          # Script documentation
+├── docs/                   # Documentation
+│   ├── TESTING.md         # Testing guide
+│   ├── DUAL_FORMAT_DOCUMENTATION.md
+│   ├── ERROR_HANDLING_IMPROVEMENTS.md
+│   └── sample_error_email.html
+├── Makefile               # Development commands
+├── pyproject.toml         # Package configuration
+└── README.md              # This file
+```
+
+## Development
+
+### Running Tests
+
+```bash
+# Run unit tests (fast, no database required)
+make test-unit
+
+# Run integration tests (requires database)
+make test-integration
+
+# Run with coverage
+make coverage
+
+# Clean cache files
+make clean
+```
+
+### Using Scripts
+
+```bash
+# Run the test runner directly
+python scripts/run_tests.py --unit --verbose
+
+# Version management
+python scripts/bump.py
+
+# See all available demo scripts
+ls scripts/demo_*.py
+```
+
 ## Quick Start
 
 ### Database Connection

{velocity_python-0.0.103 → velocity_python-0.0.105}/README.md

@@ -95,6 +95,58 @@ pip install velocity-python[sqlserver]
 pip install velocity-python[all]
 ```
 
+## Project Structure
+
+```
+velocity-python/
+├── src/velocity/           # Main package source code
+├── tests/                  # Test suite
+├── scripts/                # Utility scripts and demos
+│   ├── run_tests.py       # Test runner script
+│   ├── bump.py            # Version management
+│   ├── demo_*.py          # Demo scripts
+│   └── README.md          # Script documentation
+├── docs/                   # Documentation
+│   ├── TESTING.md         # Testing guide
+│   ├── DUAL_FORMAT_DOCUMENTATION.md
+│   ├── ERROR_HANDLING_IMPROVEMENTS.md
+│   └── sample_error_email.html
+├── Makefile               # Development commands
+├── pyproject.toml         # Package configuration
+└── README.md              # This file
+```
+
+## Development
+
+### Running Tests
+
+```bash
+# Run unit tests (fast, no database required)
+make test-unit
+
+# Run integration tests (requires database)
+make test-integration
+
+# Run with coverage
+make coverage
+
+# Clean cache files
+make clean
+```
+
+### Using Scripts
+
+```bash
+# Run the test runner directly
+python scripts/run_tests.py --unit --verbose
+
+# Version management
+python scripts/bump.py
+
+# See all available demo scripts
+ls scripts/demo_*.py
+```
+
 ## Quick Start
 
 ### Database Connection

{velocity_python-0.0.103 → velocity_python-0.0.105}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.0.103"
+version = "0.0.105"
 authors = [
-  { name="Velocity Team", email="contact@example.com" },
+  { name="Velocity Team", email="info@codeclubs.org" },
 ]
 description = "A rapid application development library for interfacing with data storage"
 readme = "README.md"
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.7"
 keywords = ["database", "orm", "sql", "rapid-development", "data-storage"]
 classifiers = [
@@ -24,7 +24,6 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
 dependencies = [

{velocity_python-0.0.103 → velocity_python-0.0.105}/src/velocity/aws/amplify.py

@@ -250,7 +250,7 @@ class AmplifyProject:
             customRules=[
                 {"source": "/<*>", "target": "/index.html", "status": "404-200"},
                 {
-                    "source": f'</^[^.]+$|\.(?!({"|".join(srv_list)})$)([^.]+$)/>',
+                    "source": f'</^[^.]+$|\\.(?!({"|".join(srv_list)})$)([^.]+$)/>',
                     "target": "/",
                     "status": "200",
                 },

{velocity_python-0.0.103 → velocity_python-0.0.105}/src/velocity/db/__init__.py

@@ -3,6 +3,17 @@ from velocity.db.servers import postgres
 from velocity.db.servers import mysql
 from velocity.db.servers import sqlite
 from velocity.db.servers import sqlserver
+from velocity.db import utils
 
 # Export exceptions at the package level for backward compatibility
 from velocity.db.exceptions import *
+
+# Export commonly used utility functions
+from velocity.db.utils import (
+    safe_sort_rows,
+    safe_sort_key_none_last,
+    safe_sort_key_none_first,
+    safe_sort_key_with_default,
+    group_by_fields,
+    safe_sort_grouped_rows
+)

{velocity_python-0.0.103 → velocity_python-0.0.105}/src/velocity/db/core/engine.py

@@ -335,8 +335,8 @@ class Engine:
             sql: The SQL statement that caused the error (optional)
             parameters: The parameters passed to the SQL statement (optional)
             
-        Returns:
-            The appropriate velocity exception to raise
+        Raises:
+            The appropriate velocity exception with proper chaining
         """
         logger = logging.getLogger(__name__)
         
@@ -369,7 +369,7 @@ class Engine:
                 if error_code in codes:
                     logger.info(f"✅ Successfully classified error: {error_code} → {error_class}")
                     try:
-                        return self._create_exception_with_chaining(
+                        raise self._create_exception_with_chaining(
                             error_class, error_message, exception, sql, parameters
                         )
                     except Exception as creation_error:
@@ -445,7 +445,7 @@ class Engine:
                 try:
                     if re.search(pattern, error_message_lower):
                         logger.info(f"✅ Classified error by pattern match: '{pattern}' → {error_class}")
-                        return self._create_exception_with_chaining(
+                        raise self._create_exception_with_chaining(
                             error_class, error_message, exception, sql, parameters
                         )
                 except re.error as regex_error:
@@ -464,7 +464,7 @@ class Engine:
             f"   → Available Classifications: {available_codes or 'None configured'}"
         )
         
-        return self._create_exception_with_chaining(
+        raise self._create_exception_with_chaining(
             'DatabaseError', error_message, exception, sql, parameters
         )
     
@@ -1082,7 +1082,7 @@ class Engine:
             else:
                 new_exception = ExceptionClass(formatted_message)
                 
-            # Only set __cause__ if original_exception is actually a BaseException
+            # Only set __cause__ if original_exception is not None and derives from BaseException
             if isinstance(original_exception, BaseException):
                 new_exception.__cause__ = original_exception  # Preserve exception chain
             
@@ -1105,7 +1105,7 @@ class Engine:
                 )
                 
                 fallback_exception = DatabaseError(formatted_message)
-                # Only set __cause__ if original_exception is actually a BaseException
+                # Only set __cause__ if original_exception is not None and derives from BaseException
                 if isinstance(original_exception, BaseException):
                     fallback_exception.__cause__ = original_exception
                 return fallback_exception

velocity_python-0.0.105/src/velocity/db/core/result.py

@@ -0,0 +1,367 @@
+import datetime
+import decimal
+from velocity.misc.format import to_json
+
+
+class Result:
+    """
+    Wraps a database cursor to provide various convenience transformations
+    (dict, list, tuple, etc.) and helps iterate over query results.
+    
+    Features:
+    - Pre-fetches first row for immediate boolean evaluation
+    - Boolean state changes as rows are consumed: bool(result) tells you if MORE rows are available
+    - Supports __bool__, is_empty(), has_results() for checking remaining results
+    - Efficient iteration without unnecessary fetchall() calls
+    - Caches next row to maintain accurate state without redundant database calls
+    
+    Boolean Behavior:
+    - Initially: bool(result) = True if query returned any rows
+    - After each row: bool(result) = True if more rows are available to fetch
+    - After last row: bool(result) = False (no more rows)
+    - After one() or scalar(): bool(result) = False (marked as exhausted)
+    """
+
+    def __init__(self, cursor=None, tx=None, sql=None, params=None):
+        self._cursor = cursor
+        # Safely extract headers from cursor description
+        try:
+            description = getattr(cursor, "description", []) or []
+            self._headers = []
+            for col in description:
+                if hasattr(col, '__getitem__'):  # Tuple-like (col[0])
+                    self._headers.append(col[0].lower())
+                elif hasattr(col, 'name'):  # Object with name attribute
+                    self._headers.append(col.name.lower())
+                else:
+                    self._headers.append(f'column_{len(self._headers)}')
+        except (AttributeError, TypeError, IndexError):
+            self._headers = []
+            
+        self.__as_strings = False
+        self.__enumerate = False
+        self.__count = -1
+        self.__columns = {}
+        self.__tx = tx
+        self.__sql = sql
+        self.__params = params
+        self.transform = lambda row: dict(zip(self.headers, row))  # Default transform
+        self._cached_first_row = None
+        self._first_row_fetched = False
+        self._exhausted = False
+        
+        # Pre-fetch the first row to enable immediate boolean evaluation
+        self._fetch_first_row()
+
+    def _fetch_first_row(self):
+        """
+        Pre-fetch the first row from the cursor to enable immediate boolean evaluation.
+        """
+        if self._first_row_fetched or not self._cursor:
+            return
+            
+        try:
+            raw_row = self._cursor.fetchone()
+            if raw_row:
+                self._cached_first_row = raw_row
+            else:
+                self._exhausted = True
+        except Exception:
+            # If there's an error fetching (e.g., cursor closed), assume no results
+            self._exhausted = True
+            self._cursor = None  # Mark cursor as invalid
+        finally:
+            self._first_row_fetched = True
+
+    def __str__(self):
+        return repr(self.all())
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if not exc_type:
+            self.close()
+
+    def __bool__(self):
+        """
+        Return True if there are more rows available to fetch.
+        This changes as rows are consumed - after the last row is fetched, this becomes False.
+        """
+        return self.has_results()
+
+    def is_empty(self):
+        """
+        Return True if there are no more rows available to fetch.
+        """
+        return not self.has_results()
+
+    def has_results(self):
+        """
+        Return True if there are more rows available to fetch.
+        This is based on whether we have a cached row or the cursor isn't exhausted.
+        """
+        return self._cached_first_row is not None or (not self._exhausted and self._cursor)
+
+    def __next__(self):
+        """
+        Iterator interface to retrieve the next row.
+        """
+        # If we have a cached first row, return it and clear the cache
+        if self._cached_first_row is not None:
+            row = self._cached_first_row
+            self._cached_first_row = None
+            # Try to pre-fetch the next row to update our state
+            self._try_cache_next_row()
+        elif not self._exhausted and self._cursor:
+            try:
+                row = self._cursor.fetchone()
+                if not row:
+                    self._exhausted = True
+                    raise StopIteration
+                # Try to pre-fetch the next row to update our state  
+                self._try_cache_next_row()
+            except Exception as e:
+                # Handle cursor errors (e.g., closed cursor)
+                self._exhausted = True
+                self._cursor = None
+                if isinstance(e, StopIteration):
+                    raise
+                raise StopIteration
+        else:
+            raise StopIteration
+
+        # Apply transformations
+        if self.__as_strings:
+            row = ["" if x is None else str(x) for x in row]
+        if self.__enumerate:
+            self.__count += 1
+            return (self.__count, self.transform(row))
+        return self.transform(row)
+
+    def _try_cache_next_row(self):
+        """
+        Try to cache the next row to maintain accurate boolean state.
+        This is called after we return a row to check if there are more.
+        """
+        if not self._cursor or self._cached_first_row is not None:
+            return
+            
+        try:
+            next_row = self._cursor.fetchone()
+            if next_row:
+                self._cached_first_row = next_row
+            else:
+                self._exhausted = True
+        except Exception:
+            # If cursor is closed or has error, mark as exhausted
+            self._exhausted = True
+            self._cursor = None
+
+    def batch(self, qty=1):
+        """
+        Yields lists (batches) of rows with size = qty until no rows remain.
+        """
+        results = []
+        while True:
+            try:
+                results.append(next(self))
+            except StopIteration:
+                if results:
+                    yield results
+                break
+            if len(results) == qty:
+                yield results
+                results = []
+
+    def all(self):
+        """
+        Retrieves all rows at once into a list.
+        """
+        results = []
+        while True:
+            try:
+                results.append(next(self))
+            except StopIteration:
+                break
+        return results
+
+    def __iter__(self):
+        return self
+
+    @property
+    def headers(self):
+        """
+        Retrieves column headers from the cursor if not already set.
+        """
+        if not self._headers and self._cursor and hasattr(self._cursor, "description"):
+            self._headers = [x[0].lower() for x in self._cursor.description]
+        return self._headers
+
+    @property
+    def columns(self):
+        """
+        Retrieves detailed column information from the cursor.
+        Gracefully handles different database types.
+        """
+        if not self.__columns and self._cursor and hasattr(self._cursor, "description"):
+            for column in self._cursor.description:
+                data = {
+                    "type_name": "unknown"  # Default value
+                }
+                
+                # Try to get type information (PostgreSQL specific)
+                try:
+                    if hasattr(column, 'type_code') and self.__tx and hasattr(self.__tx, 'pg_types'):
+                        data["type_name"] = self.__tx.pg_types.get(column.type_code, "unknown")
+                except (AttributeError, KeyError):
+                    # Keep default value
+                    pass
+                
+                # Get all other column attributes safely
+                for key in dir(column):
+                    if not key.startswith("__"):
+                        try:
+                            data[key] = getattr(column, key)
+                        except (AttributeError, TypeError):
+                            # Skip attributes that can't be accessed
+                            continue
+                            
+                column_name = getattr(column, 'name', f'column_{len(self.__columns)}')
+                self.__columns[column_name] = data
+        return self.__columns
+
+    @property
+    def cursor(self):
+        return self._cursor
+
+    def close(self):
+        """
+        Closes the underlying cursor if it exists and marks result as exhausted.
+        """
+        if self._cursor:
+            try:
+                self._cursor.close()
+            except Exception:
+                # Ignore errors when closing cursor
+                pass
+            finally:
+                self._cursor = None
+        # Mark as exhausted and clear cached data
+        self._exhausted = True
+        self._cached_first_row = None
+
+    def as_dict(self):
+        """
+        Transform each row into a dictionary keyed by column names.
+        """
+        self.transform = lambda row: dict(zip(self.headers, row))
+        return self
+
+    def as_json(self):
+        """
+        Transform each row into JSON (string).
+        """
+        self.transform = lambda row: to_json(dict(zip(self.headers, row)))
+        return self
+
+    def as_named_tuple(self):
+        """
+        Transform each row into a list of (column_name, value) pairs.
+        """
+        self.transform = lambda row: list(zip(self.headers, row))
+        return self
+
+    def as_list(self):
+        """
+        Transform each row into a list of values.
+        """
+        self.transform = lambda row: list(row)
+        return self
+
+    def as_tuple(self):
+        """
+        Transform each row into a tuple of values.
+        """
+        self.transform = lambda row: row
+        return self
+
+    def as_simple_list(self, pos=0):
+        """
+        Transform each row into the single value at position `pos`.
+        """
+        self.transform = lambda row: row[pos]
+        return self
+
+    def strings(self, as_strings=True):
+        """
+        Indicate whether retrieved rows should be coerced to string form.
+        """
+        self.__as_strings = as_strings
+        return self
+
+    def scalar(self, default=None):
+        """
+        Return the first column of the first row, or `default` if no rows.
+        After calling this method, the result is marked as exhausted.
+        """
+        if self._cached_first_row is not None:
+            val = self._cached_first_row
+            self._cached_first_row = None
+            self._exhausted = True  # Mark as exhausted since we only want one value
+            return val[0] if val else default
+        elif not self._exhausted and self._cursor:
+            try:
+                val = self._cursor.fetchone()
+                self._exhausted = True
+                return val[0] if val else default
+            except Exception:
+                # If cursor error, return default
+                self._exhausted = True
+                self._cursor = None
+                return default
+        return default
+
+    def one(self, default=None):
+        """
+        Return the first row or `default` if no rows.
+        After calling this method, the result is marked as exhausted.
+        """
+        try:
+            row = next(self)
+            # Mark as exhausted since we only want one row
+            self._exhausted = True
+            self._cached_first_row = None  # Clear any cached row
+            return row
+        except StopIteration:
+            return default
+
+    def get_table_data(self, headers=True):
+        """
+        Builds a two-dimensional list: first row is column headers, subsequent rows are data.
+        """
+        self.as_list()
+        rows = []
+        for row in self:
+            row = ["" if x is None else str(x) for x in row]
+            rows.append(row)
+        if isinstance(headers, list):
+            rows.insert(0, [x.replace("_", " ").title() for x in headers])
+        elif headers:
+            rows.insert(0, [x.replace("_", " ").title() for x in self.headers])
+        return rows
+
+    def enum(self):
+        """
+        Yields each row as (row_index, transformed_row).
+        """
+        self.__enumerate = True
+        return self
+
+    @property
+    def sql(self):
+        return self.__sql
+
+    @property
+    def params(self):
+        return self.__params

{velocity_python-0.0.103 → velocity_python-0.0.105}/src/velocity/db/core/row.py

@@ -1,4 +1,5 @@
 import pprint
+from velocity.db.exceptions import DbColumnMissingError
 
 
 class Row:
@@ -85,10 +86,21 @@ class Row:
         return list(d.items())
 
     def get(self, key, failobj=None):
-        data = self[key]
-        if data is None:
+        try:
+            data = self[key]
+            if data is None:
+                return failobj
+            return data
+        except DbColumnMissingError:
+            # Column doesn't exist in the table, return the default value
             return failobj
-        return data
+        except Exception as e:
+            # Check if the error message indicates a missing column
+            error_msg = str(e).lower()
+            if 'column' in error_msg and ('does not exist' in error_msg or 'not found' in error_msg):
+                return failobj
+            # Re-raise other exceptions
+            raise
 
     def setdefault(self, key, default=None):
         data = self[key]

{velocity_python-0.0.103 → velocity_python-0.0.105}/src/velocity/db/core/table.py

@@ -61,7 +61,8 @@ class Table:
         try:
             return self._cursor
         except:
-            self._cursor = self.tx.cursor()
+            pass
+        self._cursor = self.tx.cursor()
         return self._cursor
 
     def __call__(self, where=None):