cocoindex 0.2.3__cp311-abi3-macosx_10_12_x86_64.whl → 0.2.4__cp311-abi3-macosx_10_12_x86_64.whl

cocoindex/cli.py

@@ -5,6 +5,7 @@ import importlib.util
 import os
 import signal
 import threading
+import sys
 from types import FrameType
 from typing import Any, Iterable
 
@@ -19,9 +20,8 @@ from . import flow, lib, setting
 from .setup import flow_names_with_setup
 from .runtime import execution_context
 from .subprocess_exec import add_user_app
-from .user_app_loader import load_user_app
+from .user_app_loader import load_user_app, Error as UserAppLoaderError
 
-# Create ServerSettings lazily upon first call, as environment variables may be loaded from files, etc.
 COCOINDEX_HOST = "https://cocoindex.io"
 
 
@@ -77,7 +77,16 @@ def _get_app_ref_from_specifier(
 
 
 def _load_user_app(app_target: str) -> None:
-    load_user_app(app_target)
+    if not app_target:
+        raise click.ClickException("Application target not provided.")
+
+    try:
+        load_user_app(app_target)
+    except UserAppLoaderError as e:
+        raise click.ClickException(
+            f"Failed to load APP_TARGET '{app_target}': {e}"
+        ) from e
+
     add_user_app(app_target)
 
 
@@ -99,7 +108,13 @@ def _initialize_cocoindex_in_process() -> None:
     default=None,
     show_default=False,
 )
-def cli(env_file: str | None = None) -> None:
+@click.option(
+    "--app-dir",
+    help="Load apps from the specified directory. Default to the current directory.",
+    default="",
+    show_default=True,
+)
+def cli(env_file: str | None = None, app_dir: str | None = "") -> None:
     """
     CLI for Cocoindex.
     """
@@ -109,6 +124,9 @@ def cli(env_file: str | None = None) -> None:
         loaded_env_path = os.path.abspath(dotenv_path)
         click.echo(f"Loaded environment variables from: {loaded_env_path}\n", err=True)
 
+    if app_dir is not None:
+        sys.path.insert(0, app_dir)
+
     try:
         _initialize_cocoindex_in_process()
     except Exception as e:

cocoindex/user_app_loader.py

@@ -1,23 +1,27 @@
 import os
 import sys
 import importlib
-import click
 import types
 
 
+class Error(Exception):
+    """
+    Exception raised when a user app target is invalid or cannot be loaded.
+    """
+
+    pass
+
+
 def load_user_app(app_target: str) -> types.ModuleType:
     """
     Loads the user's application, which can be a file path or an installed module name.
     Exits on failure.
     """
-    if not app_target:
-        raise click.ClickException("Application target not provided.")
-
     looks_like_path = os.sep in app_target or app_target.lower().endswith(".py")
 
     if looks_like_path:
         if not os.path.isfile(app_target):
-            raise click.ClickException(f"Application file path not found: {app_target}")
+            raise Error(f"Application file path not found: {app_target}")
         app_path = os.path.abspath(app_target)
         app_dir = os.path.dirname(app_path)
         module_name = os.path.splitext(os.path.basename(app_path))[0]
@@ -35,7 +39,7 @@ def load_user_app(app_target: str) -> types.ModuleType:
             spec.loader.exec_module(module)
             return module
         except (ImportError, FileNotFoundError, PermissionError) as e:
-            raise click.ClickException(f"Failed importing file '{app_path}': {e}")
+            raise Error(f"Failed importing file '{app_path}': {e}") from e
         finally:
             if app_dir in sys.path and sys.path[0] == app_dir:
                 sys.path.pop(0)
@@ -44,8 +48,6 @@ def load_user_app(app_target: str) -> types.ModuleType:
     try:
         return importlib.import_module(app_target)
     except ImportError as e:
-        raise click.ClickException(f"Failed to load module '{app_target}': {e}")
+        raise Error(f"Failed to load module '{app_target}': {e}") from e
     except Exception as e:
-        raise click.ClickException(
-            f"Unexpected error importing module '{app_target}': {e}"
-        )
+        raise Error(f"Unexpected error importing module '{app_target}': {e}") from e

{cocoindex-0.2.3.dist-info → cocoindex-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cocoindex
-Version: 0.2.3
+Version: 0.2.4
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent

{cocoindex-0.2.3.dist-info → cocoindex-0.2.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
-cocoindex-0.2.3.dist-info/METADATA,sha256=TzOWNtD0v9YVOXQOdjVaZo0GrfI8QTyz1oWYVPEKbKc,12952
-cocoindex-0.2.3.dist-info/WHEEL,sha256=N8W3-0eDM6igWj-H12r7VkxoMaJIqJLxUyWCFstEaGg,105
-cocoindex-0.2.3.dist-info/entry_points.txt,sha256=_NretjYVzBdNTn7dK-zgwr7YfG2afz1u1uSE-5bZXF8,46
-cocoindex-0.2.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cocoindex-0.2.4.dist-info/METADATA,sha256=eEw6yQ-w-oMTQAEnQKYX4DBJ8M2JuaaGKW985yTDm6g,12952
+cocoindex-0.2.4.dist-info/WHEEL,sha256=N8W3-0eDM6igWj-H12r7VkxoMaJIqJLxUyWCFstEaGg,105
+cocoindex-0.2.4.dist-info/entry_points.txt,sha256=_NretjYVzBdNTn7dK-zgwr7YfG2afz1u1uSE-5bZXF8,46
+cocoindex-0.2.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 cocoindex/__init__.py,sha256=sLpSVO5Cotgn_82lawxvXnaqfa-qj33rytWBAe2MTtU,2201
-cocoindex/_engine.abi3.so,sha256=r-ndI_SFdhHFipXhFdRikdhRrr3lumUFAX0Uiens2pU,69071276
+cocoindex/_engine.abi3.so,sha256=STwfvBKklPyzptkIhYMfVlMRRxWY5RqEuJ5zgwaKHpc,69071220
 cocoindex/auth_registry.py,sha256=PE1-kVkcyC1G2C_V7b1kvYzeq73OFQehWKQP7ln7fJ8,1478
-cocoindex/cli.py,sha256=8Q2D0gI_yHorxfFC7tzV96oJAR7PtTn_T4qWLorPPoM,20675
+cocoindex/cli.py,sha256=D-mlZrH-trT5UR3N5KfQeq2CQ95odO2FTi67WIPjzPM,21120
 cocoindex/convert.py,sha256=Eh9Co37BtW_PK3Oi-pFEiFt8cc_6g7XLcurV-NeH6GU,22090
 cocoindex/flow.py,sha256=AoWt8i05MfEnnoAQR0EWzZU-9k36UmCFuNLb3itlGO0,37204
 cocoindex/functions.py,sha256=09erNt3WbzY9l1KER-akBF2O5-6xEahV2ORBECaL6yk,12260
@@ -28,7 +28,7 @@ cocoindex/tests/test_transform_flow.py,sha256=G69w-n-vnCTo3r9hVIk2lJNAQEkGUA7PZf
 cocoindex/tests/test_typing.py,sha256=9OF3lO2uSpZBefkEJx7WRbnkXjwQtvlQIeeARYQID68,12391
 cocoindex/tests/test_validation.py,sha256=X6AQzVs-hVKIXcrHMEMQnhfUE8at7iXQnPq8nHNhZ2Q,4543
 cocoindex/typing.py,sha256=lEQYIzAGVKQp6RnhyeopY9Q7xEED7yQj3ZMxvTPblV8,14200
-cocoindex/user_app_loader.py,sha256=o2n25y7CGw9Qrb-RN6tiNlv2YJ9YLM8NSMhJZjLhhKQ,1914
+cocoindex/user_app_loader.py,sha256=bc3Af-gYRxJ9GpObtpjegZY855oQBCv5FGkrkWV2yGY,1873
 cocoindex/utils.py,sha256=hUhX-XV6XGCtJSEIpBOuDv6VvqImwPlgBxztBTw7u0U,598
 cocoindex/validation.py,sha256=PZnJoby4sLbsmPv9fOjOQXuefjfZ7gmtsiTGU8SH-tc,3090
-cocoindex-0.2.3.dist-info/RECORD,,
+cocoindex-0.2.4.dist-info/RECORD,,