lmnr 0.2.13__py3-none-any.whl → 0.2.15__py3-none-any.whl

lmnr/cli/cli.py

@@ -1,7 +1,8 @@
 from pathlib import Path
 import sys
 import requests
-from dotenv import load_dotenv
+from dotenv import find_dotenv, get_key
+import importlib
 import os
 import click
 import logging
@@ -11,9 +12,14 @@ from pydantic.alias_generators import to_pascal
 from lmnr.cli.zip import zip_directory
 from lmnr.sdk.registry import Registry as Pipeline
 from lmnr.sdk.remote_debugger import RemoteDebugger
+from lmnr.types import NodeFunction
 
 from .parser.parser import runnable_graph_to_template_vars
 
+from watchdog.observers import Observer
+from watchdog.events import PatternMatchingEventHandler
+import time
+
 logger = logging.getLogger(__name__)
 
 
@@ -139,21 +145,7 @@ def deploy(endpoint_id, project_api_key):
         Path.unlink(zip_file_path, missing_ok=True)
 
 
-@cli.command(name="dev")
-@click.option(
-    "-p",
-    "--project-api-key",
-    help="Project API key",
-)
-def dev(project_api_key):
-    project_api_key = project_api_key or os.environ.get("LMNR_PROJECT_API_KEY")
-    if not project_api_key:
-        load_dotenv()
-        project_api_key = os.environ.get("LMNR_PROJECT_API_KEY")
-    if not project_api_key:
-        raise ValueError("LMNR_PROJECT_API_KEY is not set")
-
-    cur_dir = os.getcwd()  # e.g. /Users/username/project_name
+def _load_functions(cur_dir: str) -> dict[str, NodeFunction]:
     parent_dir, name = os.path.split(cur_dir)  # e.g. /Users/username, project_name
 
     # Needed to __import__ pipeline.py
@@ -164,7 +156,13 @@ def dev(project_api_key):
         sys.path.insert(0, cur_dir)
 
     module_name = f"{name}.pipeline"
-    __import__(module_name)
+    if module_name in sys.modules:
+        # Reload the module to get the updated version
+        importlib.reload(sys.modules[module_name])
+    else:
+        # Import the module for the first time
+        __import__(module_name)
+    
     module = sys.modules[module_name]
 
     matches = [v for v in module.__dict__.values() if isinstance(v, Pipeline)]
@@ -174,6 +172,59 @@ def dev(project_api_key):
         raise ValueError("Multiple Pipelines found in the module")
     pipeline = matches[0]
 
-    tools = pipeline.functions
-    debugger = RemoteDebugger(project_api_key, tools)
-    debugger.start()
+    return pipeline.functions
+
+class SimpleEventHandler(PatternMatchingEventHandler):
+    def __init__(self, project_api_key: str, session_id: str, functions: dict[str, NodeFunction]):
+        super().__init__(ignore_patterns=["*.pyc*", "*.pyo", "**/__pycache__"])
+        self.project_api_key = project_api_key
+        self.session_id = session_id
+        self.functions = functions
+        self.debugger = RemoteDebugger(project_api_key, session_id, functions)
+        self.debugger.start()
+
+    def on_any_event(self, event):
+        print(f"Files at {event.src_path} updated. Restarting debugger...")
+        self.debugger.stop()
+        self.functions = _load_functions(os.getcwd())
+        self.debugger = RemoteDebugger(self.project_api_key, self.session_id, self.functions)
+        self.debugger.start()
+
+@cli.command(name="dev")
+@click.option(
+    "-p",
+    "--project-api-key",
+    help="Project API key. If not provided, LMNR_PROJECT_API_KEY from os.environ or .env is used",
+)
+@click.option(
+    "-s",
+    "--dev-session-id",
+    help="Dev session ID. If not provided, LMNR_DEV_SESSION_ID from os.environ or .env is used",
+)
+def dev(project_api_key, dev_session_id):
+    cur_dir = os.getcwd()  # e.g. /Users/username/project_name
+    env_path = find_dotenv(usecwd=True)
+    project_api_key = project_api_key or os.environ.get("LMNR_PROJECT_API_KEY")
+    if not project_api_key:
+        project_api_key = get_key(env_path, "LMNR_PROJECT_API_KEY")
+    if not project_api_key:
+        raise ValueError("LMNR_PROJECT_API_KEY is not set")
+    
+    session_id = dev_session_id or os.environ.get("LMNR_DEV_SESSION_ID")
+    if not session_id:
+        session_id = get_key(env_path, "LMNR_DEV_SESSION_ID")
+    if not session_id:
+        raise ValueError("LMNR_DEV_SESSION_ID is not set")
+    functions = _load_functions(cur_dir)
+    
+    observer = Observer()
+    handler = SimpleEventHandler(project_api_key, session_id, functions)
+    observer.schedule(handler, cur_dir, recursive=True)
+    observer.start()
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        handler.debugger.stop()
+        observer.stop()
+    observer.join()

lmnr/sdk/remote_debugger.py

@@ -12,15 +12,17 @@ from lmnr.types import (
     ToolCallRequest,
     ToolCallResponse,
 )
-import uuid
 import json
+from concurrent.futures import ThreadPoolExecutor
 from threading import Thread
+import time
 
 
 class RemoteDebugger:
     def __init__(
         self,
         project_api_key: str,
+        dev_session_id: str,
         tools: Union[dict[str, NodeFunction], list[Callable[..., NodeInput]]] = [],
     ):
         # for simplicity and backwards compatibility, we allow the user to pass a list
@@ -30,28 +32,32 @@ class RemoteDebugger:
         self.project_api_key = project_api_key
         self.url = "wss://api.lmnr.ai/v2/endpoint/ws"
         self.tools = tools
-        self.thread = Thread(target=self._run)
         self.stop_flag = False
-        self.session = None
-
+        self.session = dev_session_id
+        self.executor = ThreadPoolExecutor(5)
+        self.running_tasks = {}  # dict[str, Future] from request_id to Future
+    
     def start(self) -> Optional[str]:
         self.stop_flag = False
-        self.session = self._generate_session_id()
-        self.thread.start()
+        self.executor.submit(self._run)
         return self.session
 
     def stop(self):
         self.stop_flag = True
-        self.thread.join()
+        self.executor.shutdown()
         self.session = None
-        # python allows running threads only once, so we need to create
-        # a new thread
-        # in case the user wants to start the debugger again
-        self.thread = Thread(target=self._run)
 
-    def _run(self):
+    def _run(self, backoff=1):
         assert self.session is not None, "Session ID not set"
         request = RegisterDebuggerRequest(debuggerSessionId=self.session)
+        try:
+            self._connect_and_run(request, backoff)
+        except Exception as e:
+            print(f"Could not connect to server. Retrying in {backoff} seconds...")
+            time.sleep(backoff)
+            self._run(min(backoff * 2, 60))
+    
+    def _connect_and_run(self, request: RegisterDebuggerRequest, backoff=1):
         with connect(
             self.url,
             additional_headers={"Authorization": f"Bearer {self.project_api_key}"},
@@ -61,15 +67,42 @@ class RemoteDebugger:
             req_id = None
 
             while not self.stop_flag:
+                # first check if any of the running tasks are done
+                done_tasks = []
+                for req_id, future in self.running_tasks.items():
+                    if not future.done():
+                        continue
+                    done_tasks.append(req_id)
+                    try:
+                        response = future.result()
+                    except Exception as e:
+                        error_message = (
+                            "Error occurred while running tool" + f"{tool.__name__}: {e}"
+                        )
+                        e = ToolCallError(error=error_message, reqId=req_id)
+                        websocket.send(e.model_dump_json())
+                        continue
+                    formatted_response = None
+                    try:
+                        formatted_response = ToolCallResponse(
+                            reqId=req_id, response=response
+                        )
+                    except pydantic.ValidationError:
+                        formatted_response = ToolCallResponse(
+                            reqId=req_id, response=str(response)
+                        )
+                    websocket.send(formatted_response.model_dump_json())
+                for req_id in done_tasks:
+                    del self.running_tasks[req_id]
                 try:
                     # blocks the thread until a message
-                    # is received or a timeout (3 seconds) occurs
-                    message = websocket.recv(3)
+                    # is received or a timeout (0.1 seconds) occurs
+                    message = websocket.recv(0.1)
                 except TimeoutError:
                     continue
                 except websockets.exceptions.ConnectionClosedError:
-                    print("Connection closed. Please restart the debugger.")
-                    return
+                    print("Connection interrupted by server. Trying to reconnect...")
+                    self._run()
                 try:
                     tool_call = ToolCallRequest.model_validate_json(message)
                     req_id = tool_call.reqId
@@ -93,39 +126,18 @@ class RemoteDebugger:
                     arguments = json.loads(tool_call.toolCall.function.arguments)
                 except Exception:
                     pass
-                try:
-                    response = tool(**arguments)
-                except Exception as e:
-                    error_message = (
-                        "Error occurred while running tool" + f"{tool.__name__}: {e}"
-                    )
-                    e = ToolCallError(error=error_message, reqId=req_id)
-                    websocket.send(e.model_dump_json())
-                    continue
-                formatted_response = None
-                try:
-                    formatted_response = ToolCallResponse(
-                        reqId=tool_call.reqId, response=response
-                    )
-                except pydantic.ValidationError:
-                    formatted_response = ToolCallResponse(
-                        reqId=tool_call.reqId, response=str(response)
-                    )
-                websocket.send(formatted_response.model_dump_json())
+                self.running_tasks[tool_call.reqId] = self.executor.submit(tool, **arguments)
             websocket.send(
                 DeregisterDebuggerRequest(
                     debuggerSessionId=self.session, deregister=True
                 ).model_dump_json()
             )
 
-    def _generate_session_id(self) -> str:
-        return uuid.uuid4().urn[9:]
-
     def _format_session_id_and_registerd_functions(self) -> str:
         registered_functions = ",\n".join(["- " + k for k in self.tools.keys()])
         return f"""
 ========================================
-Debugger Session ID:
+Dev Session ID:
 {self.session}
 ========================================
 

{lmnr-0.2.13.dist-info → lmnr-0.2.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lmnr
-Version: 0.2.13
+Version: 0.2.15
 Summary: Python SDK for Laminar AI
 License: Apache-2.0
 Author: lmnr.ai
@@ -14,11 +14,12 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: black (>=24.4.2,<25.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: cookiecutter (>=2.6.0,<3.0.0)
-Requires-Dist: lmnr-baml (>=0.40.0,<0.41.0)
+Requires-Dist: lmnr-baml (>=0.40.1,<0.41.0)
 Requires-Dist: pydantic (>=2.7.4,<3.0.0)
 Requires-Dist: pystache (>=0.6.5,<0.7.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: watchdog (>=4.0.2,<5.0.0)
 Requires-Dist: websockets (>=12.0,<13.0)
 Description-Content-Type: text/markdown
 
@@ -38,8 +39,7 @@ pip install lmnr
 
 - Make Laminar endpoint calls from your Python code
 - Make Laminar endpoint calls that can run your own functions as tools
-- CLI to generate code from pipelines you build on Laminar
-- `LaminarRemoteDebugger` to execute your own functions while you test your flows in workshop
+- CLI to generate code from pipelines you build on Laminar or execute your own functions while you test your flows in workshop
 
 ## Making Laminar endpoint calls
 
@@ -106,41 +106,47 @@ result = l.run(
 
 ## LaminarRemoteDebugger
 
-If your pipeline contains tool call nodes, they will be able to call your local code.
-If you want to test them from the Laminar workshop in your browser, you can attach to your
-locally running debugger.
+If your pipeline contains local call nodes, they will be able to call code right on your machine.
+
+### Step by step instructions to connect to Laminar:
 
-### Step by step instructions to use `LaminarRemoteDebugger`:
+#### 1. Create your pipeline with function call nodes
 
-#### 1. Create your pipeline with tool call nodes
+Add function calls to your pipeline; these are signature definitions of your functions
 
-Add tool calls to your pipeline; node names must match the functions you want to call.
+#### 2. Implement the functions
 
-#### 2. Start LaminarRemoteDebugger in your code
+At the root level, create a file: `pipeline.py`
+
+Annotate functions with the same name.
 
 Example:
 
 ```python
-from lmnr import LaminarRemoteDebugger, NodeInput
+from lmnr import Pipeline
 
-# adding **kwargs is safer, in case an LLM produces more arguments than needed
-def my_tool(arg1: string, arg2: string, **kwargs) -> NodeInput:
-    return f'{arg1}&{arg2}'
+lmnr = Pipeline()
 
-debugger = LaminarRemoteDebugger('<YOUR_PROJECT_API_KEY>', [my_tool])
-session_id = debugger.start()  # the session id will also be printed to console
+@lmnr.func("foo") # the node in the pipeline is called foo and has one parameter arg
+def custom_logic(arg: str) -> str:
+    return arg * 10
 ```
 
-This will establish a connection with Laminar API and allow for the pipeline execution
-to call your local functions.
+#### 3. Link lmnr.ai workshop to your machine
 
-#### 3. Link lmnr.ai workshop to your debugger
+1. At the root level, create a `.env` file if not already
+1. In project settings, create or copy a project api key.
+1. Add an entry in `.env` with: `LMNR_PROJECT_API_KEY=s0meKey...`
+1. In project settings create or copy a dev session. These are your individual sessions.
+1. Add an entry in `.env` with: `LMNR_DEV_SESSION_ID=01234567-89ab-cdef-0123-4567890ab`
 
-Set up `DEBUGGER_SESSION_ID` environment variable in your pipeline.
+#### 4. Run the dev environment
 
-#### 4. Run and experiment
+```sh
+lmnr dev
+```
 
-You can run as many sessions as you need, experimenting with your flows.
+This will start a session, try to persist it, and reload the session on files change.
 
 ## CLI for code generation
 

{lmnr-0.2.13.dist-info → lmnr-0.2.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
 lmnr/__init__.py,sha256=BBJ87AiHC_OpaYOCzF8QSsf7eO3LlJPOCBXHNKurbE4,235
 lmnr/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/cli/__main__.py,sha256=8hDtWlaFZK24KhfNq_ZKgtXqYHsDQDetukOCMlsbW0Q,59
-lmnr/cli/cli.py,sha256=6xmIxRAMx7th0S9rfkzUeWyt-oWaiwPWk4YeVzXhElQ,5509
+lmnr/cli/cli.py,sha256=4wu9ke-S1dvFiTK1qkQsgzjAJ2iDnxfHA-AgmhQLvuY,7539
 lmnr/cli/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/cli/parser/nodes/__init__.py,sha256=2MkPdKulb1kuNe6aT71CaqBA8iBrXyb5pq5bu_EvCb8,1052
 lmnr/cli/parser/nodes/code.py,sha256=8lTPBibUzaw_t-9QoPljhxH3KA4CLn9DJjA-iWpprOA,933
@@ -19,10 +19,10 @@ lmnr/cli/zip.py,sha256=u2-LcYtQdZ_FIW0-PM-WGjclNPoB8v6OecrI79PyLPw,607
 lmnr/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/sdk/endpoint.py,sha256=0HjcxMUcJz-klFZO2f5xtTaoLjcaEb8vrJ_YldTWUc8,7467
 lmnr/sdk/registry.py,sha256=sEYQFOjO72YvgBSEkBrvoewFExoyBzx6nELgBarvD6Y,755
-lmnr/sdk/remote_debugger.py,sha256=BYAN13KUDxH412qD3HXdDH0RfokrePquDt35fzB7GUg,5010
+lmnr/sdk/remote_debugger.py,sha256=c0a6_YZJmSmIyTL8Ybu6Ln4k8KiybwqcGqWude_Pi10,5756
 lmnr/types.py,sha256=3HpLBQZr6F5YMISHYLnzzyrTwUttNqJxpyobw31YYJQ,2347
-lmnr-0.2.13.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
-lmnr-0.2.13.dist-info/METADATA,sha256=G0wy4T7F8TlHpFXky86Bq5hV3nt1VNZ6hf9XUVbraew,5565
-lmnr-0.2.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lmnr-0.2.13.dist-info/entry_points.txt,sha256=Qg7ZRax4k-rcQsZ26XRYQ8YFSBiyY2PNxYfq4a6PYXI,41
-lmnr-0.2.13.dist-info/RECORD,,
+lmnr-0.2.15.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
+lmnr-0.2.15.dist-info/METADATA,sha256=9b7MMvOj7_OGUe3k3DBi8sAd2uaVh5QMlnxF1cEb91A,5565
+lmnr-0.2.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lmnr-0.2.15.dist-info/entry_points.txt,sha256=Qg7ZRax4k-rcQsZ26XRYQ8YFSBiyY2PNxYfq4a6PYXI,41
+lmnr-0.2.15.dist-info/RECORD,,