jerry-thomas 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

datapipeline/cli/app.py

@@ -490,7 +490,10 @@ def main() -> None:
     args = parser.parse_args()
 
     # Resolve dataset/project selection for commands that use a project.
-    if hasattr(args, "project") or hasattr(args, "dataset"):
+    needs_project_resolution = args.cmd in {"serve", "build", "inspect"}
+    if needs_project_resolution and (
+        hasattr(args, "project") or hasattr(args, "dataset")
+    ):
         raw_project = getattr(args, "project", None)
         raw_dataset = getattr(args, "dataset", None)
         resolved_project, resolved_dataset = _resolve_project_from_args(

datapipeline/cli/commands/plugin.py

@@ -1,10 +1,14 @@
+import logging
 from pathlib import Path
 from datapipeline.services.scaffold.plugin import scaffold_plugin
 
 
+logger = logging.getLogger(__name__)
+
+
 def bar(subcmd: str, name: str | None, out: str) -> None:
     if subcmd == "init":
         if not name:
-            print("[error] Plugin name is required. Use 'jerry plugin init <name>' or pass -n/--name.")
+            logger.error("Plugin name is required. Use 'jerry plugin init <name>' or pass -n/--name.")
             raise SystemExit(2)
         scaffold_plugin(name, Path(out))

datapipeline/services/scaffold/plugin.py

@@ -1,23 +1,29 @@
 from importlib.resources import as_file, files
 from pathlib import Path
+import logging
+import os
+
+import yaml
+
+from datapipeline.utils.load import load_yaml
 
 from ..constants import DEFAULT_IO_LOADER_EP
 
+logger = logging.getLogger(__name__)
+
 _RESERVED_PACKAGE_NAMES = {"datapipeline"}
 
 
 def _normalized_package_name(dist_name: str) -> str:
     package_name = dist_name.replace("-", "_")
     if package_name in _RESERVED_PACKAGE_NAMES:
-        print(
-            "[error] `datapipeline` is reserved for the core package. "
-            "Choose a different plugin name."
+        logger.error(
+            "`datapipeline` is reserved for the core package. Choose a different plugin name."
         )
         raise SystemExit(1)
     if not package_name.isidentifier():
-        print(
-            "[error] Plugin names must be valid Python identifiers once hyphens are replaced "
-            "with underscores."
+        logger.error(
+            "Plugin names must be valid Python identifiers once hyphens are replaced with underscores."
         )
         raise SystemExit(1)
     return package_name
@@ -26,7 +32,7 @@ def _normalized_package_name(dist_name: str) -> str:
 def scaffold_plugin(name: str, outdir: Path) -> None:
     target = (outdir / name).absolute()
     if target.exists():
-        print(f"[error] `{target}` already exists")
+        logger.error("`%s` already exists", target)
         raise SystemExit(1)
     import shutil
 
@@ -46,4 +52,42 @@ def scaffold_plugin(name: str, outdir: Path) -> None:
         for placeholder, value in replacements.items():
             text = text.replace(placeholder, value)
         p.write_text(text)
-    print(f"[new] plugin skeleton at {target}")
+
+    # Move jerry.yaml up to the workspace root (current working directory) so
+    # users can run the CLI from the workspace without cd'ing into the plugin.
+    # We adjust plugin_root and dataset paths to point at the plugin directory
+    # relative to the workspace. Do not overwrite an existing workspace
+    # jerry.yaml.
+    plugin_jerry = target / "jerry.yaml"
+    workspace_root = Path.cwd().resolve()
+    workspace_jerry = workspace_root / "jerry.yaml"
+    if plugin_jerry.exists() and not workspace_jerry.exists():
+        try:
+            plugin_root_rel = target.relative_to(workspace_root)
+        except ValueError:
+            # Fall back to a relative path between arbitrary directories; this
+            # may include ".." segments.
+            try:
+                plugin_root_rel = Path(os.path.relpath(target, workspace_root))
+            except Exception:
+                plugin_root_rel = target
+
+        data = load_yaml(plugin_jerry)
+        data["plugin_root"] = plugin_root_rel.as_posix()
+        datasets = data.get("datasets") or {}
+        updated_datasets = {}
+        for alias, path in datasets.items():
+            p = Path(path)
+            if p.is_absolute():
+                updated_datasets[alias] = p.as_posix()
+            else:
+                updated_datasets[alias] = (plugin_root_rel / p).as_posix()
+        data["datasets"] = updated_datasets
+
+        workspace_jerry.write_text(
+            yaml.safe_dump(data, sort_keys=False), encoding="utf-8"
+        )
+        plugin_jerry.unlink()
+        logger.info("workspace jerry.yaml created at %s", workspace_jerry)
+
+    logger.info("plugin skeleton created at %s", target)

datapipeline/templates/plugin_skeleton/README.md

@@ -10,6 +10,8 @@ Quick start
   - HTTP data: `jerry source add <provider>.<dataset> -t http -f <json|json-lines|csv>`
   - Synthetic: `jerry source add -p <provider> -d <dataset> -t synthetic`
 - Edit the generated `config/sources/*.yaml` to fill in the `path`, delimiter, etc.
+- `jerry.yaml` is placed in your workspace root (alongside the plugin folder) so
+  you can run CLI commands from there; `plugin_root` points back to this plugin.
 - Reinstall after EP changes (pyproject.toml) and restart Python processes:
   - Core: `cd lib/datapipeline && python -m pip install -e .`
   - This plugin: `python -m pip install -e .`

datapipeline/templates/plugin_skeleton/jerry.yaml

@@ -1,28 +1,34 @@
-# Workspace defaults. Move this file to the root of your workspace if you serve
-# configs outside the plugin repo; the CLI searches upward from cwd for jerry.yaml.
+# Workspace defaults. The scaffolder copies this to your workspace root (where
+# you ran `jerry plugin init`). CLI commands walk upward from cwd to find it.
 
-plugin_root: . # relative path to the plugin repo root
+# Relative path from this workspace file back to the plugin root.
+plugin_root: . # e.g., "lib/myplugin" if your plugin lives under lib/
 
+# Dataset aliases for `--dataset`; values may be dirs (auto-append project.yaml).
 datasets:
   example: example/project.yaml
   your-second-example-dataset: your-dataset/project.yaml
 
+# Default dataset alias when --dataset/--project are omitted.
 default_dataset: example
 
+# Shared fallbacks used by all commands (unless overridden).
 shared:
   visuals: AUTO # AUTO | TQDM | RICH | OFF
   progress: BARS # AUTO | SPINNER | BARS | OFF
-  log_level: INFO
+  log_level: INFO # Default log level when not set elsewhere
 
+# Defaults for `jerry serve` (run-time options).
 serve:
-  # log_level: INFO
-  limit: null
-  stage: null
+  # log_level: INFO # Uncomment to force INFO for serve runs
+  limit: null      # Cap vectors; null means unlimited
+  stage: null      # Preview a specific stage; null runs the full pipeline
   output:
     transport: stdout
-    format: print # set to fs + directory for file outputs
-    # directory: artifacts/serve
+    format: print  # stdout: print|json-lines|json|csv|pickle
+    # directory: artifacts/serve # Required when transport=fs
 
+# Defaults for `jerry build` (artifact materialization).
 build:
-  # log_level: INFO
+  # log_level: INFO # Uncomment to set build log level
   mode: AUTO # AUTO | FORCE | OFF

datapipeline/templates/plugin_skeleton/pyproject.toml

@@ -7,5 +7,5 @@ name = "{{DIST_NAME}}"
 version = "0.0.1"
 description = "A DataPipeline plugin for the {{DIST_NAME}} domain"
 dependencies = [
-  "jerry-thomas>=0.2.0",
+  "jerry-thomas>=1.0.2",
 ]

{jerry_thomas-1.0.0.dist-info → jerry_thomas-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jerry-thomas
-Version: 1.0.0
+Version: 1.0.2
 Summary: Jerry-Thomas: a stream-first, plugin-friendly data pipeline (mixology-themed CLI)
 Author: Anders Skott Lind
 License: MIT

{jerry_thomas-1.0.0.dist-info → jerry_thomas-1.0.2.dist-info}/RECORD

@@ -14,14 +14,14 @@ datapipeline/build/tasks/metadata.py,sha256=3eHI1vBRwm-fT342gu1wgj7oXNXKZ94D30wk
 datapipeline/build/tasks/scaler.py,sha256=knJbdeGdDvYZ4O15ra4mnVkmLZbRZbCdJdjfELe_LnU,2554
 datapipeline/build/tasks/schema.py,sha256=kJnAlD_Z8Pd_c9kJH5bDVixB_Vi_mBkKWpjW7eZru1s,2163
 datapipeline/build/tasks/utils.py,sha256=iFMJ8hWk1iRnQ1bUz0huiKlWyevt3x0g8Vh6PNzlMU8,6335
-datapipeline/cli/app.py,sha256=yjaKjEbQbDUAvigU5D8Q2UPbKFRs9l8bHVIG-56Nrsc,24056
+datapipeline/cli/app.py,sha256=KZDTdig3IvSZBq4M3kcxz-RkbOTBEu2sdBUDdS-QWSg,24174
 datapipeline/cli/commands/build.py,sha256=OPJ-r3WWAzWwa1wHK0zxnQhuM_1h1mSfNpPRl_Bqrf8,8979
 datapipeline/cli/commands/contract.py,sha256=bPWhWZgdnkk_Ajlm9zUJrvZ3SlyXVqBxx-IJV1zZ5kM,14953
 datapipeline/cli/commands/domain.py,sha256=JdOMlfpZP996kuNGePdjCGMKrqezo-cX8lhlOfd9F44,479
 datapipeline/cli/commands/filter.py,sha256=vhoCIETJNUJmiI37ZdBNaeJAm6O4AU_tveJxVj47S8A,307
 datapipeline/cli/commands/inspect.py,sha256=aatn_olRcFaLyya6r2QMlzzAzlbguEtQ7mKRxoEOFAA,16066
 datapipeline/cli/commands/list_.py,sha256=m9o_exiiC_aiQXsR4lZv_QmN1hfpSNq4ICvYLgiS2e8,1605
-datapipeline/cli/commands/plugin.py,sha256=RER1aBiiITYyvCtWxaqAiEqUGJGzKhw6oWSeajtd5ns,374
+datapipeline/cli/commands/plugin.py,sha256=jUMBrxLw0QX61a2wf7rRGAWFg42xLZkI-C-HyUHiob4,427
 datapipeline/cli/commands/run.py,sha256=TmbyggYOlF972oxwLhh-r27ggeWARg0_WfCMQJAudS8,8348
 datapipeline/cli/commands/run_config.py,sha256=zeXCuDz1ez6Zd6Tq2N0S-YIPs1ZQ8U3fN3lvvd56108,3194
 datapipeline/cli/commands/serve_pipeline.py,sha256=7i1HbuFIbYKkM-aQ2BrDN57K1kFv6NJ4EAN6NOz4aFE,5036
@@ -104,7 +104,7 @@ datapipeline/services/scaffold/__init__.py,sha256=PaQNtYki9Kc7mQPnUtKDPU-rKohLHo
 datapipeline/services/scaffold/domain.py,sha256=mww7HhZ1ZepNvn2tHczpLZH0y3Ej7vgDGVLepFkTgIY,946
 datapipeline/services/scaffold/filter.py,sha256=EwLFeI3cRoHw-hYE3jlLfqV0DKk9Z8EnWyVymJmOppA,1084
 datapipeline/services/scaffold/mappers.py,sha256=kkkJ-UB51B2yawRoUst3CGExn3gRYPm5d_3kbujPVMQ,1960
-datapipeline/services/scaffold/plugin.py,sha256=bocH4Z1k3ReqnfLSzdXLiQP4SG9R97kZ5hj14_7GYFM,1699
+datapipeline/services/scaffold/plugin.py,sha256=Eecb-OUJsn-upsq2vC88JYOyYTRbrIxsPu4yYorziqs,3407
 datapipeline/services/scaffold/source.py,sha256=w0w-oID9x48eMV6c0FhqW1myAWh_ELYmFojsdfVlaTk,6649
 datapipeline/services/scaffold/templates.py,sha256=B3YnZpFUZLynijJosTNxZQLXnPP_Y_t1RHqfI1lGOxU,634
 datapipeline/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -124,9 +124,9 @@ datapipeline/sources/synthetic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 datapipeline/sources/synthetic/time/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datapipeline/sources/synthetic/time/loader.py,sha256=X_NQJFAHL8wHV5TxbLhRwqGfFJPOw6qVToBkKFD3r_k,2003
 datapipeline/sources/synthetic/time/parser.py,sha256=d3GZMQ7L1Qi4LeEm7U3y0_pk0RdhskioQukYyqyoqic,343
-datapipeline/templates/plugin_skeleton/README.md,sha256=lRaDeFPK-r1qPUYmPkTztfHptVfbxlKmCOgKaAJJaHc,7490
-datapipeline/templates/plugin_skeleton/jerry.yaml,sha256=ubM5REHH5gEqbCBuUIBXRsSx6iuJjQ96yzn7RQBDMpk,705
-datapipeline/templates/plugin_skeleton/pyproject.toml,sha256=0lmO5Aia9tB81Ez4SxP56DGisekx-palMmGCUzmAl4E,259
+datapipeline/templates/plugin_skeleton/README.md,sha256=L1FvFQrubqbnHbK8qB_Hz38JeYKlTQu5rjqDfhIVANw,7652
+datapipeline/templates/plugin_skeleton/jerry.yaml,sha256=TYfZl0_HMnfj6F3oaSWq25Vb1BZlpILIIMU1N0U4L28,1343
+datapipeline/templates/plugin_skeleton/pyproject.toml,sha256=gMSwoLK_Xv51ecQq5ufKpXj-Oi7JNRroK7cmP0nTsvY,259
 datapipeline/templates/plugin_skeleton/example/dataset.yaml,sha256=cSKk8IyoJebdc9b959Sw7gDfBXl2BT8hktyZ4Z43Nog,471
 datapipeline/templates/plugin_skeleton/example/postprocess.yaml,sha256=yUYr5c6YtBeF_rm_ENsOMkn_sOAChzbqhL98WKr0CRw,710
 datapipeline/templates/plugin_skeleton/example/project.yaml,sha256=4WyrlBCZZ47ceOw9nV8QgqU7_jH5Fu8-z4SJGKbPYK8,845
@@ -191,9 +191,9 @@ datapipeline/utils/placeholders.py,sha256=epZQ7NifUWI7_7hZKGEkCBDOaMnN9LiqJdI2gv
 datapipeline/utils/rich_compat.py,sha256=4ZfR82gG1vAVUiILVINqcRReqoUiRPmQOlLLBXz-pC0,1166
 datapipeline/utils/time.py,sha256=vOqa2arqwEqbDo-JWEhOFPMnI1E4Ib3i1L-Rt-cGH8c,1072
 datapipeline/utils/window.py,sha256=J5CkEIdY5iZd1QY9wawmHpBXpCp2FzHOHXhjYTCZWl8,2576
-jerry_thomas-1.0.0.dist-info/licenses/LICENSE,sha256=pkBMylAJF5yChHAkdxwFhEptLGx13i-XFEKh-Sh6DkM,1073
-jerry_thomas-1.0.0.dist-info/METADATA,sha256=lcnvJMQUbZ_cECGZhmkZz0zOvGZlVOtym3A1X_SaVNw,33507
-jerry_thomas-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jerry_thomas-1.0.0.dist-info/entry_points.txt,sha256=jsJFp_2aEEhKkL2I3Yc4yPSODy9ggDZmLeV75KPjb9A,1672
-jerry_thomas-1.0.0.dist-info/top_level.txt,sha256=N8aoNPdPyHefODO4YAm7tqTaUcw0e8LDcqycFTf8TbM,13
-jerry_thomas-1.0.0.dist-info/RECORD,,
+jerry_thomas-1.0.2.dist-info/licenses/LICENSE,sha256=pkBMylAJF5yChHAkdxwFhEptLGx13i-XFEKh-Sh6DkM,1073
+jerry_thomas-1.0.2.dist-info/METADATA,sha256=LaFPs7mVS4d-9j2SHSkU0RGlPSUMvYD6EJAEaqU_Bp8,33507
+jerry_thomas-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jerry_thomas-1.0.2.dist-info/entry_points.txt,sha256=jsJFp_2aEEhKkL2I3Yc4yPSODy9ggDZmLeV75KPjb9A,1672
+jerry_thomas-1.0.2.dist-info/top_level.txt,sha256=N8aoNPdPyHefODO4YAm7tqTaUcw0e8LDcqycFTf8TbM,13
+jerry_thomas-1.0.2.dist-info/RECORD,,