sqlbuild 0.26.0__tar.gz → 0.26.1__tar.gz

sqlbuild-0.26.1/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.26.1"
+}

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.26.1](https://github.com/chio-labs/sqlbuild/compare/v0.26.0...v0.26.1) (2026-06-02)
+
+
+### Bug Fixes
+
+* enforce python node factory folders ([ec2b7ac](https://github.com/chio-labs/sqlbuild/commit/ec2b7acf3e0eea237f209b394f9db1c4994fc602))
+* enforce python node factory folders ([27117d6](https://github.com/chio-labs/sqlbuild/commit/27117d69e83dd5e63e73f796d5f02bf462796fcf))
+
 ## [0.26.0](https://github.com/chio-labs/sqlbuild/compare/v0.25.1...v0.26.0) (2026-06-02)
 
 

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbuild
-Version: 0.26.0
+Version: 0.26.1
 Summary: Typed, test-first SQL pipelines with local E2E testing
 License-File: LICENSE
 Requires-Python: >=3.12

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sqlbuild"
-version = "0.26.0"
+version = "0.26.1"
 description = "Typed, test-first SQL pipelines with local E2E testing"
 readme = "README.md"
 requires-python = ">=3.12"

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/src/sqlbuild/cli/commands/main/helpers/init/scaffold.py

@@ -14,6 +14,9 @@ def scaffold_blank_project(*, base_dir: Path, project_name: str) -> None:
         "sources",
         "seeds",
         "loaders",
+        "tasks",
+        "assets",
+        "checks",
         "tests/unit",
         "tests/scenarios",
         "functions/sql",

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/src/sqlbuild/cli/commands/main/init.py

@@ -42,10 +42,11 @@ def run_init(project_dir: Path | None) -> int:
     doc.section("Next steps")
     doc.line("  1. Add sources to sources/")
     doc.line("  2. Add seeds to seeds/ or loaders to loaders/")
-    doc.line("  3. Add functions to functions/ or macros to macros/")
-    doc.line("  4. Add models to models/staging/ and models/marts/")
-    doc.line("  5. Add tests to tests/unit/ or tests/scenarios/")
-    doc.command_line("  6. ", "sqb compile")
-    doc.command_line("  7. ", "sqb build")
+    doc.line("  3. Add tasks to tasks/, assets to assets/, or checks to checks/")
+    doc.line("  4. Add functions to functions/ or macros to macros/")
+    doc.line("  5. Add models to models/staging/ and models/marts/")
+    doc.line("  6. Add tests to tests/unit/ or tests/scenarios/")
+    doc.command_line("  7. ", "sqb compile")
+    doc.command_line("  8. ", "sqb build")
     print(doc.render(), end="")
     return 0

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/src/sqlbuild/compiler/discovery/helpers/filesystem.py

@@ -66,6 +66,15 @@ from sqlbuild.spec.models.schema import SchemaModelEntry, SchemaSeedEntry
 from sqlbuild.spec.models.source import SourceEntry
 from sqlbuild.tasks import get_task_definition
 
+_PYTHON_NODE_KIND_FOLDERS: tuple[str, ...] = ("loaders", "tasks", "assets", "checks")
+_PYTHON_NODE_FACTORY_FOLDERS: tuple[str, ...] = (*_PYTHON_NODE_KIND_FOLDERS, "factories")
+_PYTHON_NODE_KIND_BY_FOLDER: dict[str, str] = {
+    "loaders": "loader",
+    "tasks": "task",
+    "assets": "asset",
+    "checks": "check",
+}
+
 
 @dataclass
 class _PythonNodeDiscoveryBucket:
@@ -390,7 +399,7 @@ def discover_python_node_functions(*, project_dir: Path) -> DiscoveredPythonNode
 def _discover_python_node_functions(*, project_dir: Path) -> _PythonNodeDiscoveryBucket:
     bucket: _PythonNodeDiscoveryBucket = _PythonNodeDiscoveryBucket()
     node_folder: str
-    for node_folder in ("loaders", "tasks", "assets", "checks"):
+    for node_folder in _PYTHON_NODE_FACTORY_FOLDERS:
         node_root: Path = project_dir / node_folder
         if not node_root.is_dir():
             continue
@@ -412,6 +421,7 @@ def _discover_python_node_functions(*, project_dir: Path) -> _PythonNodeDiscover
                 module=module,
                 file_path=file_path,
                 project_dir=project_dir,
+                node_folder=node_folder,
             )
     return bucket
 
@@ -422,16 +432,19 @@ def _append_module_python_nodes(
     module: ModuleType,
     file_path: Path,
     project_dir: Path,
+    node_folder: str,
 ) -> None:
-    for _, value in inspect.getmembers(module, inspect.isfunction):
-        if value.__module__ != module.__name__:
-            continue
-        _append_python_node_function(
-            bucket=bucket,
-            function=value,
-            file_path=file_path,
-            project_dir=project_dir,
-        )
+    if node_folder != "factories":
+        for _, value in inspect.getmembers(module, inspect.isfunction):
+            if value.__module__ != module.__name__:
+                continue
+            _append_python_node_function(
+                bucket=bucket,
+                function=value,
+                file_path=file_path,
+                project_dir=project_dir,
+                expected_kind=_PYTHON_NODE_KIND_BY_FOLDER.get(node_folder),
+            )
     for _, value in inspect.getmembers(module, inspect.isfunction):
         if value.__module__ != module.__name__:
             continue
@@ -452,6 +465,8 @@ def _append_module_python_nodes(
                 function=generated_function,
                 file_path=file_path,
                 project_dir=project_dir,
+                expected_kind=_PYTHON_NODE_KIND_BY_FOLDER.get(node_folder),
+                factory_definition=factory_definition,
             ):
                 raise PythonNodeDiscoveryError(
                     f"Factory '{factory_definition.name}' in "
@@ -466,9 +481,19 @@ def _append_python_node_function(
     function: Callable[..., object],
     file_path: Path,
     project_dir: Path,
+    expected_kind: str | None = None,
+    factory_definition: FactoryDefinition | None = None,
 ) -> bool:
     loader_definition: LoaderDefinition | None = get_loader_definition(function)
     if loader_definition is not None:
+        _validate_python_node_kind(
+            actual_kind="loader",
+            expected_kind=expected_kind,
+            function_name=loader_definition.name,
+            factory_definition=factory_definition,
+            file_path=file_path,
+            project_dir=project_dir,
+        )
         bucket.loaders.append(
             DiscoveredLoaderFunction(
                 file_path=file_path,
@@ -487,6 +512,14 @@ def _append_python_node_function(
         return True
     task_definition: TaskDefinition | None = get_task_definition(function)
     if task_definition is not None:
+        _validate_python_node_kind(
+            actual_kind="task",
+            expected_kind=expected_kind,
+            function_name=task_definition.name,
+            factory_definition=factory_definition,
+            file_path=file_path,
+            project_dir=project_dir,
+        )
         bucket.tasks.append(
             DiscoveredTaskFunction(
                 file_path=file_path,
@@ -504,6 +537,14 @@ def _append_python_node_function(
         return True
     asset_definition: AssetDefinition | None = get_asset_definition(function)
     if asset_definition is not None:
+        _validate_python_node_kind(
+            actual_kind="asset",
+            expected_kind=expected_kind,
+            function_name=asset_definition.name,
+            factory_definition=factory_definition,
+            file_path=file_path,
+            project_dir=project_dir,
+        )
         bucket.assets.append(
             DiscoveredAssetFunction(
                 file_path=file_path,
@@ -523,6 +564,14 @@ def _append_python_node_function(
         return True
     check_definition: CheckDefinition | None = get_check_definition(function)
     if check_definition is not None:
+        _validate_python_node_kind(
+            actual_kind="check",
+            expected_kind=expected_kind,
+            function_name=check_definition.name,
+            factory_definition=factory_definition,
+            file_path=file_path,
+            project_dir=project_dir,
+        )
         bucket.checks.append(
             DiscoveredCheckFunction(
                 file_path=file_path,
@@ -541,6 +590,31 @@ def _append_python_node_function(
     return False
 
 
+def _validate_python_node_kind(
+    *,
+    actual_kind: str,
+    expected_kind: str | None,
+    function_name: str,
+    factory_definition: FactoryDefinition | None,
+    file_path: Path,
+    project_dir: Path,
+) -> None:
+    if expected_kind is None or actual_kind == expected_kind:
+        return
+    relative_path: Path = file_path.relative_to(project_dir)
+    folder: str = relative_path.parts[0]
+    if factory_definition is None:
+        article: str = "an" if actual_kind[0] in {"a", "e", "i", "o", "u"} else "a"
+        raise PythonNodeDiscoveryError(
+            f"Python node '{function_name}' in {folder}/ is {article} {actual_kind}; "
+            f"{actual_kind}s must live in {actual_kind}s/ or be generated from factories/."
+        )
+    raise PythonNodeDiscoveryError(
+        f"Factory {factory_definition.name} in {folder}/ returned a {actual_kind} "
+        f"'{function_name}'; mixed-kind factories must live in factories/."
+    )
+
+
 def _call_factory(
     *,
     factory: Callable[..., object],

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/tests/unit/src/sqlbuild/cli/commands/main/init/test_run.py

@@ -21,6 +21,9 @@ from tests.unit.src.sqlbuild.cli.commands.main.init._test_types import InitScaff
                 "sources",
                 "seeds",
                 "loaders",
+                "tasks",
+                "assets",
+                "checks",
                 "tests/unit",
                 "tests/scenarios",
                 "functions/sql",
@@ -34,6 +37,9 @@ from tests.unit.src.sqlbuild.cli.commands.main.init._test_types import InitScaff
                 "sources/.gitkeep",
                 "seeds/.gitkeep",
                 "loaders/.gitkeep",
+                "tasks/.gitkeep",
+                "assets/.gitkeep",
+                "checks/.gitkeep",
                 "tests/unit/.gitkeep",
                 "tests/scenarios/.gitkeep",
                 "functions/sql/.gitkeep",
@@ -49,15 +55,16 @@ from tests.unit.src.sqlbuild.cli.commands.main.init._test_types import InitScaff
                 "Next steps:",
                 "1. Add sources to sources/",
                 "2. Add seeds to seeds/ or loaders to loaders/",
-                "3. Add functions to functions/ or macros to macros/",
-                "6. sqb compile",
-                "7. sqb build",
+                "3. Add tasks to tasks/, assets to assets/, or checks to checks/",
+                "4. Add functions to functions/ or macros to macros/",
+                "7. sqb compile",
+                "8. sqb build",
             ),
             expected_color_fragments=(
                 "\033[32m\033[1mSQLBuild project created\033[0m",
                 "  \033[34m\033[1mProject\033[0m: demo_project",
                 "\033[1mNext steps\033[0m:",
-                "  6. \033[2msqb compile\033[0m",
+                "  7. \033[2msqb compile\033[0m",
             ),
         )
     ],
@@ -115,7 +122,7 @@ def test_given_empty_directory_when_running_init_then_scaffolds_project_director
                 "\033[32m\033[1mSQLBuild project created\033[0m",
                 "  \033[34m\033[1mProject\033[0m: color_project",
                 "\033[1mNext steps\033[0m:",
-                "  6. \033[2msqb compile\033[0m",
+                "  7. \033[2msqb compile\033[0m",
             ),
         )
     ],

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/tests/unit/src/sqlbuild/compiler/discovery/helpers/test_filesystem_factories.py

@@ -18,7 +18,7 @@ TEST_CASES: tuple[DiscoverPythonNodeFactoriesTestCase, ...] = (
     DiscoverPythonNodeFactoriesTestCase(
         description="discovers mixed nodes returned by a factory",
         files={
-            "tasks/generated.py": """
+            "factories/generated.py": """
 from sqlbuild.assets import asset
 from sqlbuild.checks import check
 from sqlbuild.factories import factory
@@ -102,19 +102,13 @@ def generated_loaders():
         description="discovers set node returned by a factory",
         files={
             "checks/generated.py": """
-from sqlbuild.assets import asset
 from sqlbuild.checks import check
 from sqlbuild.factories import factory
 
 
-@asset(name="orders_export")
-def export(ctx):
-    return {}
-
-
 @factory
 def generated_checks():
-    @check(name="orders_export_exists", depends_on=export)
+    @check(name="orders_export_exists", depends_on=())
     def generated_check(ctx):
         return True
     return {generated_check}
@@ -122,10 +116,9 @@ def generated_checks():
         },
         expected_loader_names=(),
         expected_task_names=(),
-        expected_asset_names=("orders_export",),
+        expected_asset_names=(),
         expected_check_names=("orders_export_exists",),
-        expected_asset_dependency_counts=(0,),
-        expected_check_dependency_counts=(1,),
+        expected_check_dependency_counts=(0,),
     ),
     DiscoverPythonNodeFactoriesTestCase(
         description="discovers single node returned by a factory in assets folder",
@@ -369,6 +362,27 @@ def broken_factory():
         expected_check_names=(),
         expected_error_fragment="failed during discovery: boom",
     ),
+    DiscoverPythonNodeFactoriesTestCase(
+        description="raises when direct node kind does not match folder",
+        files={
+            "checks/generated.py": """
+from sqlbuild.assets import asset
+
+
+@asset(name="orders_export")
+def export(ctx):
+    return {}
+""",
+        },
+        expected_loader_names=(),
+        expected_task_names=(),
+        expected_asset_names=(),
+        expected_check_names=(),
+        expected_error_fragment=(
+            "Python node 'orders_export' in checks/ is an asset; "
+            "assets must live in assets/ or be generated from factories/."
+        ),
+    ),
 )
 
 

{sqlbuild-0.26.0 → sqlbuild-0.26.1}/tests/unit/src/sqlbuild/compiler/discovery/test_main.py

@@ -285,7 +285,7 @@ def generated_loaders():
         description="generated task and asset dependency validates",
         repo_files=base_repo_files()
         | {
-            "tasks/generated.py": """
+            "factories/generated.py": """
 from sqlbuild.assets import asset
 from sqlbuild.factories import factory
 from sqlbuild.tasks import task
@@ -307,6 +307,26 @@ def generated_nodes():
         expected_task_names=("prepare_orders",),
         expected_asset_names=("orders_export",),
     ),
+    DiscoverFactoryValidationTestCase(
+        description="single-kind factory validates in factories folder",
+        repo_files=base_repo_files()
+        | {
+            "factories/generated_tasks.py": """
+from sqlbuild.factories import factory
+from sqlbuild.tasks import task
+
+
+@factory
+def generated_tasks():
+    @task(name="prepare_orders")
+    def prepare(ctx):
+        return None
+
+    return prepare
+""",
+        },
+        expected_task_names=("prepare_orders",),
+    ),
 )
 
 
@@ -444,6 +464,29 @@ def generated_loaders():
         },
         expected_error_fragment="Managed source 'raw_orders' in sources/raw.yml requires loader",
     ),
+    DiscoverFactoryValidationTestCase(
+        description="kind-folder factory returning foreign kind fails validation",
+        repo_files=base_repo_files()
+        | {
+            "assets/generated.py": """
+from sqlbuild.factories import factory
+from sqlbuild.loaders import loader
+
+
+@factory
+def gen():
+    @loader(name="raw_orders")
+    def load(ctx):
+        return []
+
+    return load
+""",
+        },
+        expected_error_fragment=(
+            "Factory gen in assets/ returned a loader 'raw_orders'; "
+            "mixed-kind factories must live in factories/."
+        ),
+    ),
 )
 
 

sqlbuild-0.26.0/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.26.0"
-}