cocoindex 0.1.54__cp311-cp311-macosx_11_0_arm64.whl → 0.1.55__cp311-cp311-macosx_11_0_arm64.whl

cocoindex/cli.py

@@ -2,11 +2,15 @@ import atexit
 import datetime
 import importlib.util
 import os
+import signal
 import sys
+import threading
 import types
+from types import FrameType
 from typing import Any
 
 import click
+import watchfiles
 from dotenv import find_dotenv, load_dotenv
 from rich.console import Console
 from rich.panel import Panel
@@ -116,6 +120,12 @@ def _load_user_app(app_target: str) -> types.ModuleType:
         )
 
 
+def _initialize_cocoindex_in_process() -> None:
+    settings = setting.Settings.from_env()
+    lib.init(settings)
+    atexit.register(lib.stop)
+
+
 @click.group()
 @click.version_option(package_name="cocoindex", message="%(prog)s version %(version)s")
 @click.option(
@@ -128,7 +138,7 @@ def _load_user_app(app_target: str) -> types.ModuleType:
     default=None,
     show_default=False,
 )
-def cli(env_file: str | None) -> None:
+def cli(env_file: str | None = None) -> None:
     """
     CLI for Cocoindex.
     """
@@ -139,9 +149,7 @@ def cli(env_file: str | None) -> None:
         click.echo(f"Loaded environment variables from: {loaded_env_path}", err=True)
 
     try:
-        settings = setting.Settings.from_env()
-        lib.init(settings)
-        atexit.register(lib.stop)
+        _initialize_cocoindex_in_process()
     except Exception as e:
         raise click.ClickException(f"Failed to initialize CocoIndex library: {e}")
 
@@ -485,6 +493,14 @@ def evaluate(
     default=False,
     help="Avoid printing anything to the standard output, e.g. statistics.",
 )
+@click.option(
+    "-r",
+    "--reload",
+    is_flag=True,
+    show_default=True,
+    default=False,
+    help="Enable auto-reload on code changes.",
+)
 def server(
     app_target: str,
     address: str | None,
@@ -493,6 +509,7 @@ def server(
     cors_origin: str | None,
     cors_cocoindex: bool,
     cors_local: int | None,
+    reload: bool,
 ) -> None:
     """
     Start a HTTP server providing REST APIs.
@@ -502,6 +519,58 @@ def server(
     APP_TARGET: path/to/app.py or installed_module.
     """
     app_ref = _get_app_ref_from_specifier(app_target)
+    args = (
+        app_ref,
+        address,
+        cors_origin,
+        cors_cocoindex,
+        cors_local,
+        live_update,
+        quiet,
+    )
+
+    if reload:
+        watch_paths = {os.getcwd()}
+        if os.path.isfile(app_ref):
+            watch_paths.add(os.path.dirname(os.path.abspath(app_ref)))
+        else:
+            try:
+                spec = importlib.util.find_spec(app_ref)
+                if spec and spec.origin:
+                    watch_paths.add(os.path.dirname(os.path.abspath(spec.origin)))
+            except ImportError:
+                pass
+
+        watchfiles.run_process(
+            *watch_paths,
+            target=_reloadable_server_target,
+            args=args,
+            watch_filter=watchfiles.PythonFilter(),
+            callback=lambda changes: click.secho(
+                f"\nDetected changes in {len(changes)} file(s), reloading server...\n",
+                fg="cyan",
+            ),
+        )
+    else:
+        _run_server(*args)
+
+
+def _reloadable_server_target(*args: Any, **kwargs: Any) -> None:
+    """Reloadable target for the watchfiles process."""
+    _initialize_cocoindex_in_process()
+    _run_server(*args, **kwargs)
+
+
+def _run_server(
+    app_ref: str,
+    address: str | None = None,
+    cors_origin: str | None = None,
+    cors_cocoindex: bool = False,
+    cors_local: int | None = None,
+    live_update: bool = False,
+    quiet: bool = False,
+) -> None:
+    """Helper function to run the server with specified settings."""
     _load_user_app(app_ref)
 
     server_settings = setting.ServerSettings.from_env()
@@ -525,7 +594,17 @@ def server(
     if live_update:
         options = flow.FlowLiveUpdaterOptions(live_mode=True, print_stats=not quiet)
         flow.update_all_flows(options)
-    input("Press Enter to stop...")
+
+    click.secho("Press Ctrl+C to stop the server.", fg="yellow")
+
+    shutdown_event = threading.Event()
+
+    def handle_signal(signum: int, frame: FrameType | None) -> None:
+        shutdown_event.set()
+
+    signal.signal(signal.SIGINT, handle_signal)
+    signal.signal(signal.SIGTERM, handle_signal)
+    shutdown_event.wait()
 
 
 def _flow_name(name: str | None) -> str:

cocoindex/convert.py

@@ -42,8 +42,6 @@ def encode_engine_value(value: Any) -> Any:
         return [
             [encode_engine_value(k)] + encode_engine_value(v) for k, v in value.items()
         ]
-    if isinstance(value, uuid.UUID):
-        return value.bytes
     return value
 
 
@@ -92,9 +90,6 @@ def make_engine_value_decoder(
                 f"passed in {src_type_kind}, declared {dst_annotation} ({dst_type_info.kind})"
             )
 
-    if src_type_kind == "Uuid":
-        return lambda value: uuid.UUID(bytes=value)
-
     if dst_type_info is None:
         if src_type_kind == "Struct" or src_type_kind in TABLE_TYPES:
             raise ValueError(

cocoindex/tests/test_convert.py

@@ -122,7 +122,7 @@ def test_encode_engine_value_basic_types() -> None:
 
 def test_encode_engine_value_uuid() -> None:
     u = uuid.uuid4()
-    assert encode_engine_value(u) == u.bytes
+    assert encode_engine_value(u) == u
 
 
 def test_encode_engine_value_date_time_types() -> None:
@@ -285,8 +285,8 @@ def test_non_ndarray_vector_decoding() -> None:
     decoder = make_engine_value_decoder(["field"], src_type, dst_type_uuid)
     uuid1 = uuid.uuid4()
     uuid2 = uuid.uuid4()
-    input_bytes = [uuid1.bytes, uuid2.bytes]
-    result = decoder(input_bytes)
+    input_uuids = [uuid1, uuid2]
+    result = decoder(input_uuids)
     assert isinstance(result, list)
     assert all(isinstance(x, uuid.UUID) for x in result)
     assert result == [uuid1, uuid2]
@@ -579,7 +579,7 @@ def test_roundtrip_union_simple() -> None:
 
 def test_roundtrip_union_with_active_uuid() -> None:
     t = str | uuid.UUID | int
-    value = uuid.uuid4().bytes
+    value = uuid.uuid4()
     validate_full_roundtrip(value, t)
 
 

{cocoindex-0.1.54.dist-info → cocoindex-0.1.55.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: cocoindex
-Version: 0.1.54
+Version: 0.1.55
 Requires-Dist: sentence-transformers>=3.3.1
 Requires-Dist: click>=8.1.8
 Requires-Dist: rich>=14.0.0
 Requires-Dist: python-dotenv>=1.1.0
+Requires-Dist: watchfiles>=1.1.0
 Requires-Dist: pytest ; extra == 'test'
 Requires-Dist: ruff ; extra == 'dev'
 Requires-Dist: pre-commit ; extra == 'dev'

{cocoindex-0.1.54.dist-info → cocoindex-0.1.55.dist-info}/RECORD

@@ -1,12 +1,12 @@
-cocoindex-0.1.54.dist-info/METADATA,sha256=YhrfcjAPuh3OkyFCVB_tkaT_dY9NV7HMhOHIQVBqnCk,9907
-cocoindex-0.1.54.dist-info/WHEEL,sha256=8hL2oHqulIPF_TJ_OfB-8kD2X9O6HJL0emTmeguFbqc,104
-cocoindex-0.1.54.dist-info/entry_points.txt,sha256=_NretjYVzBdNTn7dK-zgwr7YfG2afz1u1uSE-5bZXF8,46
-cocoindex-0.1.54.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cocoindex-0.1.55.dist-info/METADATA,sha256=fBybxUgGTU6YgheU84q4bZUx0Y4Vz_N7Nt2Puo-os_k,9940
+cocoindex-0.1.55.dist-info/WHEEL,sha256=uknsTnQ4D3qZvtLjoBwOrQ-H3LYkwihRUx6jxoJPLSU,104
+cocoindex-0.1.55.dist-info/entry_points.txt,sha256=_NretjYVzBdNTn7dK-zgwr7YfG2afz1u1uSE-5bZXF8,46
+cocoindex-0.1.55.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 cocoindex/__init__.py,sha256=3potlGouaGAznMTEqU5QKuB934qpD1xR6ZH6EL3YMWw,1782
-cocoindex/_engine.cpython-311-darwin.so,sha256=DCV77kRyWJLfkrvc59a8nwMQUqSwwp_e6DdyUiJHy7c,57472480
+cocoindex/_engine.cpython-311-darwin.so,sha256=Azzx_tOFZQa28dl3jxT9lLclvWapymtN4CAEEASXyR8,57618192
 cocoindex/auth_registry.py,sha256=1XqO7ibjmBBd8i11XSJTvTgdz8p1ptW-ZpuSgo_5zzk,716
-cocoindex/cli.py,sha256=yXlUZqJuB9baofnpHFOu3S-0x0xGglmJ88nd9_T-fEs,18223
-cocoindex/convert.py,sha256=4-a0uWLOfQ_e2OOwHjIYAsBMZIDRnGbK01Ye1E2ybIQ,10377
+cocoindex/cli.py,sha256=6SiViK_aSfIaYWvzLm-TFOlH-GVEaLALNnxnSatfo3k,20341
+cocoindex/convert.py,sha256=XeSr0ykudBrB-RWRmcbdbt3WCihlLDSBIYUcDtPbTdA,10228
 cocoindex/flow.py,sha256=djpGsQlSZV10OCS_81GY9k8q_0l-6MeismLnoF9XteE,30023
 cocoindex/functions.py,sha256=Lh1aSovd6HaikAWvDi6dX0poyma1MqBX5S9FAzIR8c4,2622
 cocoindex/index.py,sha256=j93B9jEvvLXHtpzKWL88SY6wCGEoPgpsQhEGHlyYGFg,540
@@ -20,9 +20,9 @@ cocoindex/setup.py,sha256=u5dYZFKfz4yZLiGHD0guNaR0s4zY9JAoZWrWHpAHw_0,773
 cocoindex/sources.py,sha256=JCnOhv1w4o28e03i7yvo4ESicWYAhckkBg5bQlxNH4U,1330
 cocoindex/targets.py,sha256=Nfh_tpFd1goTnS_cxBjIs4j9zl3Z4Z1JomAQ1dl3Sic,2796
 cocoindex/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cocoindex/tests/test_convert.py,sha256=RxbCmW3cSZQVJtAWZBBH9YNAViWVSi7u0JO8JGJl7M8,36174
+cocoindex/tests/test_convert.py,sha256=1IoJzfPtM5zoy0YKhTsZTX-fF4xA3w_4usyS4UN44vE,36150
 cocoindex/tests/test_optional_database.py,sha256=snAmkNa6wtOSaxoZE1HgjvL5v_ylitt3Jt_9df4Cgdc,8506
 cocoindex/tests/test_typing.py,sha256=t6UCYShcfonTfjBlGRWPiFGMZ8DGFfABXo6idekPoJE,14757
 cocoindex/typing.py,sha256=kPMFVKs2i4SCLzW1Tn5NP_Ev9DAc-2qW6eJ68gpLexU,12580
 cocoindex/utils.py,sha256=hUhX-XV6XGCtJSEIpBOuDv6VvqImwPlgBxztBTw7u0U,598
-cocoindex-0.1.54.dist-info/RECORD,,
+cocoindex-0.1.55.dist-info/RECORD,,

{cocoindex-0.1.54.dist-info → cocoindex-0.1.55.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.8.7)
+Generator: maturin (1.9.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_11_0_arm64