TypeDAL 4.4.1__tar.gz → 4.4.3__tar.gz

{typedal-4.4.1 → typedal-4.4.3}/.crush/logs/crush.log

@@ -23,3 +23,12 @@
 {"time":"2026-01-26T17:11:34.786142525+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).createAndStartLSPClient","file":"github.com/charmbracelet/crush/internal/app/lsp.go","line":76},"msg":"LSP client initialized","name":"python"}
 {"time":"2026-01-26T17:11:43.042930337+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
 {"time":"2026-01-26T17:11:44.911909276+01:00","level":"WARN","source":{"function":"github.com/charmbracelet/crush/internal/agent/tools.init.func1","file":"github.com/charmbracelet/crush/internal/agent/tools/rg.go","line":18},"msg":"Ripgrep (rg) not found in $PATH. Some grep features might be limited or slower."}
+{"time":"2026-01-26T18:10:19.727802782+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":55},"msg":"Fetching providers from Catwalk"}
+{"time":"2026-01-26T18:10:19.926137244+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/config.(*catwalkSync).Get.func1","file":"github.com/charmbracelet/crush/internal/config/catwalk.go","line":63},"msg":"Catwalk providers not modified"}
+{"time":"2026-01-26T18:10:19.926245207+01:00","level":"WARN","source":{"function":"github.com/charmbracelet/crush/internal/config.(*Config).configureProviders","file":"github.com/charmbracelet/crush/internal/config/load.go","line":259},"msg":"Skipping provider due to missing API key","provider":"anthropic"}
+{"time":"2026-01-26T18:10:19.927808467+01:00","level":"INFO","msg":"goose: no migrations to run. current version: 20250812000000"}
+{"time":"2026-01-26T18:10:19.927858435+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).initLSPClients","file":"github.com/charmbracelet/crush/internal/app/lsp.go","line":21},"msg":"LSP clients initialization started in background"}
+{"time":"2026-01-26T18:10:19.928006013+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.New.func1","file":"github.com/charmbracelet/crush/internal/app/app.go","line":110},"msg":"Initializing MCP clients"}
+{"time":"2026-01-26T18:10:20.546676356+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/app.(*App).createAndStartLSPClient","file":"github.com/charmbracelet/crush/internal/app/lsp.go","line":76},"msg":"LSP client initialized","name":"python"}
+{"time":"2026-01-26T18:11:07.640056766+01:00","level":"INFO","source":{"function":"github.com/charmbracelet/crush/internal/agent.(*sessionAgent).generateTitle","file":"github.com/charmbracelet/crush/internal/agent/agent.go","line":788},"msg":"generated title with small model"}
+{"time":"2026-01-26T18:11:11.201161834+01:00","level":"WARN","source":{"function":"github.com/charmbracelet/crush/internal/agent/tools.init.func1","file":"github.com/charmbracelet/crush/internal/agent/tools/rg.go","line":18},"msg":"Ripgrep (rg) not found in $PATH. Some grep features might be limited or slower."}

{typedal-4.4.1 → typedal-4.4.3}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v4.4.3 (2026-02-11)
+
+### Fix
+
+* Move env shell-style expansion to configuraptor, improved functionality using expandvars instead of custom implementation ([`8b41b91`](https://github.com/trialandsuccess/TypeDAL/commit/8b41b91d55c8893d5ce15c2decf6daa855fa230b))
+
+## v4.4.2 (2026-01-26)
+
+### Fix
+
+* **memoize:** Simplify `related_tables` logic by just looking at the raw Rows.fields ([`3dee337`](https://github.com/trialandsuccess/TypeDAL/commit/3dee3379a2bbcd493be273344303aff0aff069a7))
+
 ## v4.4.1 (2026-01-26)
 
 ### Fix

{typedal-4.4.1 → typedal-4.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 4.4.1
+Version: 4.4.3
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.11
 Requires-Dist: configurable-json<2
-Requires-Dist: configuraptor<2,>=1.27.1
+Requires-Dist: configuraptor<3,>=2.0.1
 Requires-Dist: dill<1
 Requires-Dist: legacy-cgi; python_version >= '3.13'
 Requires-Dist: pydal>=20251012.3
@@ -32,6 +32,7 @@ Requires-Dist: tomlkit; extra == 'all'
 Requires-Dist: typer<0.19,>=0.18; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: contextlib-chdir; extra == 'dev'
+Requires-Dist: ewok; extra == 'dev'
 Requires-Dist: hatch; extra == 'dev'
 Requires-Dist: mkdocs; extra == 'dev'
 Requires-Dist: mkdocs-dracula-theme; extra == 'dev'

{typedal-4.4.1 → typedal-4.4.3}/mkdocs.yml

@@ -6,10 +6,11 @@ nav:
   - 2. Defining Tables: 2_defining_tables.md
   - 3. Building Queries: 3_building_queries.md
   - 4. Relationships: 4_relationships.md
-  - 5. py4web: 5_py4web.md
+  - 5. py4web and web2py: 5_py4web.md
   - 6. Migrations: 6_migrations.md
   - 7. Configuration: 7_configuration.md
   - 8. Mixins: 8_mixins.md
+  - 9. Function Memoization: 9_memoization.md
 extra:
   version:
     default: stable

{typedal-4.4.1 → typedal-4.4.3}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
 dependencies = [
     "pydal >= 20251012.3", # core
     "dill < 1", # caching
-    "configuraptor >= 1.27.1, < 2", # config
+    "configuraptor >= 2.0.1, < 3", # config
     "Configurable-JSON < 2", # json dumping
     "python-slugify < 9",
     "legacy-cgi; python_version >= '3.13'",
@@ -63,6 +63,7 @@ all = [
 dev = [
     # build:
     "hatch",
+    "ewok",
     # test:
     "su6[all]>=1.9.0",
     "python-semantic-release < 8",

{typedal-4.4.1 → typedal-4.4.3}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "4.4.1"
+__version__ = "4.4.3"

{typedal-4.4.1 → typedal-4.4.3}/src/typedal/caching.py

@@ -577,30 +577,15 @@ def memoize(
         return cached, "cached"
     # Cache miss - compute result
 
-    def track_execute(qb: "QueryBuilder[t.Any]", raw: Rows):
+    def track_execute(_qb: "QueryBuilder[t.Any]", raw: Rows):
         # find dependant table+id combinations, includes relationships:
         deps.update(_determine_dependencies_auto(raw))
 
-        # tables: qb.model;
-        # something with qb.relationships
-        # something with qb.select_args
-
-        related_tables = (
-            {
-                # original table
-                str(qb.model)
-            }
-            | {
-                # other tables in select()
-                _get_table_name(arg)
-                for arg in qb.select_args
-            }
-            | {
-                # other tables in relationships
-                str(r.table)
-                for r in qb.relationships.values()
-            }
-        )
+        related_tables = {
+            # skip qb.select, just look at the final fields in the raw data:
+            _get_table_name(field)
+            for field in raw.fields
+        }
 
         # mark dependency for every relevant table in this query without id:
         deps.update({(table, 0) for table in related_tables})

{typedal-4.4.1 → typedal-4.4.3}/src/typedal/config.py

@@ -3,10 +3,8 @@ TypeDAL can be configured by a combination of pyproject.toml (static), env (dyna
 """
 
 import os
-import re
 import typing as t
 import warnings
-from collections import defaultdict
 from pathlib import Path
 
 import tomli
@@ -16,6 +14,8 @@ from dotenv import dotenv_values, find_dotenv
 
 from .types import AnyDict
 
+from configuraptor.helpers import expand_env_vars_into_toml_values
+
 if t.TYPE_CHECKING:
     from edwh_migrate import Config as MigrateConfig
     from pydal2sql.typer_support import Config as P2SConfig
@@ -244,88 +244,6 @@ def transform(data: AnyDict, prop: str) -> bool:
     return False
 
 
-def expand_posix_vars(posix_expr: str, context: dict[str, str]) -> str:
-    """
-    Replace case-insensitive POSIX and Docker Compose-like environment variables in a string with their values.
-
-    Args:
-        posix_expr (str): The input string containing case-insensitive POSIX or Docker Compose-like variables.
-        context (dict): A dictionary containing variable names and their respective values.
-
-    Returns:
-        str: The string with replaced variable values.
-
-    See Also:
-        https://stackoverflow.com/questions/386934/how-to-evaluate-environment-variables-into-a-string-in-python
-        and ChatGPT
-    """
-    env = defaultdict(lambda: "")
-    for key, value in context.items():
-        env[key.lower()] = value
-
-    # Regular expression to match "${VAR:default}" pattern
-    pattern = r"\$\{([^}]+)\}"
-
-    def replace_var(match: re.Match[t.Any]) -> str:
-        var_with_default = match.group(1)
-        var_name, default_value = var_with_default.split(":") if ":" in var_with_default else (var_with_default, "")
-        return env.get(var_name.lower(), default_value)
-
-    return re.sub(pattern, replace_var, posix_expr)
-
-
-def expand_env_vars_into_toml_values(toml: AnyDict, env: AnyDict) -> None:
-    """
-    Recursively expands POSIX/Docker Compose-like environment variables in a TOML dictionary.
-
-    This function traverses a TOML dictionary and expands POSIX/Docker Compose-like
-    environment variables (${VAR:default}) using values provided in the 'env' dictionary.
-    It performs in-place modification of the 'toml' dictionary.
-
-    Args:
-        toml (dict): A TOML dictionary with string values possibly containing environment variables.
-        env (dict): A dictionary containing environment variable names and their respective values.
-
-    Returns:
-        None: The function modifies the 'toml' dictionary in place.
-
-    Notes:
-        The function recursively traverses the 'toml' dictionary. If a value is a string or a list of strings,
-        it attempts to substitute any environment variables found within those strings using the 'env' dictionary.
-
-    Example:
-        toml_data = {
-            'key1': 'This has ${ENV_VAR:default}',
-            'key2': ['String with ${ANOTHER_VAR}', 'Another ${YET_ANOTHER_VAR}']
-        }
-        environment = {
-            'ENV_VAR': 'replaced_value',
-            'ANOTHER_VAR': 'value_1',
-            'YET_ANOTHER_VAR': 'value_2'
-        }
-
-        expand_env_vars_into_toml_values(toml_data, environment)
-        # 'toml_data' will be modified in place:
-        # {
-        #     'key1': 'This has replaced_value',
-        #     'key2': ['String with value_1', 'Another value_2']
-        # }
-    """
-    if not toml or not env:
-        return
-
-    for key, var in toml.items():
-        if isinstance(var, dict):
-            expand_env_vars_into_toml_values(var, env)
-        elif isinstance(var, list):
-            toml[key] = [expand_posix_vars(_, env) for _ in var if isinstance(_, str)]
-        elif isinstance(var, str):
-            toml[key] = expand_posix_vars(var, env)
-        else:
-            # nothing to substitute
-            continue
-
-
 def load_config(
     connection_name: t.Optional[str] = None,
     _use_pyproject: bool | str | None = True,

typedal-4.4.3/tasks.py

@@ -0,0 +1,54 @@
+"""Task automation using ewok (invoke-compatible)."""
+
+import re
+from pathlib import Path
+
+from ewok import Context, task
+
+# Compiled regex pattern for replacing the nav section in mkdocs.yml
+NAV_SECTION_PATTERN = re.compile(r"nav:.*?(?=\n[a-z_]+:|$)", re.DOTALL)
+
+
+def extract_title(md_file: Path) -> str:
+    """Extract the title from a markdown file's first heading."""
+    first_line = md_file.read_text(encoding="utf-8").split("\n", 1)[0].strip()
+    # Remove the leading # and any extra whitespace
+    return first_line.lstrip("#").strip()
+
+
+def generate_nav_entries() -> list[str]:
+    """Generate nav entries from numbered markdown files in docs/."""
+    docs_dir = Path(__file__).parent / "docs"
+
+    # Find all numbered chapter files (supports 1-N digits)
+    chapters = [f for f in docs_dir.glob("*_*.md") if f.stem.split("_", 1)[0].isdigit()]
+
+    return [
+        f"  - {extract_title(chapter)}: {chapter.name}"
+        for chapter in sorted(
+            chapters,
+            key=lambda f: int(f.stem.split("_", 1)[0]),
+        )
+    ]
+
+
+@task
+def update_docs_nav(ctx: Context) -> None:
+    """Update mkdocs.yml nav section from actual markdown files to prevent sync issues."""
+    mkdocs_file = Path(__file__).parent / "mkdocs.yml"
+
+    content = mkdocs_file.read_text(encoding="utf-8")
+
+    # Generate new nav entries
+    nav_entries = generate_nav_entries()
+    new_nav_section = "nav:\n" + "\n".join(nav_entries)
+
+    # Replace the nav section
+    updated_content = NAV_SECTION_PATTERN.sub(new_nav_section, content)
+
+    mkdocs_file.write_text(updated_content, encoding="utf-8")
+
+    print(f"✓ Updated mkdocs.yml with {len(nav_entries)} chapters")
+    print("\nGenerated nav:")
+    for entry in nav_entries:
+        print(entry)

{typedal-4.4.1 → typedal-4.4.3}/tests/test_relationships.py

@@ -789,7 +789,7 @@ def test_memoize_with_empty_table():
 
     # Memoize a function with empty table
     def get_all_users() -> list[str]:
-        users = User.join().select(User.name).execute()  # also tests execute instead of collect
+        users = User.join().select("user.name").execute()  # also tests execute instead of collect
         return [user[User.name] for user in users]
 
     # First call with empty table