lmnr 0.1.3__py3-none-any.whl → 0.2.1__py3-none-any.whl

lmnr/__init__.py

@@ -1,5 +1,7 @@
 from .sdk.endpoint import Laminar
 from .types import (
-    ChatMessage, EndpointRunError, EndpointRunResponse,
-    NodeInput, SDKError,
-)
+    ChatMessage,
+    EndpointRunError,
+    EndpointRunResponse,
+    NodeInput
+)

lmnr/cli/cli.py

@@ -56,7 +56,7 @@ def pull(pipeline_name, pipeline_version_name, project_api_key, loglevel):
         "pipelineVersionName": pipeline_version_name,
     }
     res = requests.get(
-        "https://api.lmnr.ai/v1/pipeline-version-by-name",
+        "https://api.lmnr.ai/v2/pipeline-version-by-name",
         headers=headers,
         params=params,
     )
@@ -73,7 +73,7 @@ def pull(pipeline_name, pipeline_version_name, project_api_key, loglevel):
 
     pipeline_version = res.json()
 
-    class_name = to_pascal(pipeline_name.replace(" ", "_"))
+    class_name = to_pascal(pipeline_name.replace(" ", "_").replace("-", "_"))
 
     context = {
         "pipeline_name": pipeline_name,
@@ -91,7 +91,7 @@ def pull(pipeline_name, pipeline_version_name, project_api_key, loglevel):
         output_dir=".",
         config_file=None,
         extra_context=context,
-        directory="cli",
+        directory="cli/",
         no_input=True,
         overwrite_if_exists=True,
     )

lmnr/cli/parser/nodes/types.py

@@ -5,6 +5,7 @@ from lmnr.cli.parser.nodes import Handle, HandleType, NodeFunctions
 from lmnr.cli.parser.utils import map_handles
 from lmnr.types import NodeInput, ChatMessage
 
+
 def node_input_from_json(json_val: Any) -> NodeInput:
     if isinstance(json_val, str):
         return json_val

lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/{{cookiecutter.pipeline_dir_name}}.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 import logging
 from typing import Optional, Union
 
-from lmnr_engine.types import ChatMessageList, ChatMessage
+from lmnr.types import ChatMessage
 from lmnr_engine.engine import Engine
 {% set function_names = cookiecutter._tasks.values() | selectattr('node_type', '!=', 'Input') | map(attribute='function_name') | join(', ') %}
 from .nodes.functions import {{ function_names }}
@@ -19,7 +19,7 @@ class PipelineRunnerError(Exception):
 
 @dataclass
 class PipelineRunOutput:
-    value: Union[str, ChatMessageList]
+    value: Union[str, list[ChatMessage]]
 
 
 # This class is not imported in other files and can be renamed to desired name
@@ -55,7 +55,7 @@ class {{ cookiecutter.class_name }}:
                 run_inputs[inp_name] = inp
             else:
                 assert isinstance(inp, list), f"Invalid input type: {type(inp)}"
-                run_inputs[inp_name] = [ChatMessage.from_dict(msg) for msg in inp]
+                run_inputs[inp_name] = [ChatMessage.model_validate(msg) for msg in inp]
 
         tasks = []
         {% for task in cookiecutter._tasks.values() %}

lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/types.py

@@ -2,22 +2,7 @@ from dataclasses import dataclass
 from typing import Union
 import uuid
 import datetime
-
-
-@dataclass
-class ChatMessage:
-    role: str
-    content: str
-
-    @classmethod
-    def from_dict(cls, data: dict) -> "ChatMessage":
-        return cls(
-            role=data["role"],
-            content=data["content"],
-        )
-
-
-NodeInput = Union[str, list[ChatMessage]]  # TODO: Add conditioned value
+from lmnr.types import NodeInput, ChatMessage
 
 
 @dataclass

lmnr/sdk/endpoint.py

@@ -2,7 +2,7 @@ import json
 from pydantic.alias_generators import to_snake
 import pydantic
 import requests
-from ..types import (
+from lmnr.types import (
     EndpointRunError, EndpointRunResponse, NodeInput, EndpointRunRequest,
     ToolCall, SDKError
 )
@@ -21,7 +21,7 @@ class Laminar:
         """        
         self.project_api_key = project_api_key
         self.url = 'https://api.lmnr.ai/v2/endpoint/run'
-        self.ws_url = 'ws://api.lmnr.ai/v2/endpoint/ws'
+        self.ws_url = 'wss://api.lmnr.ai/v2/endpoint/ws'
     
     def run (
         self,
@@ -120,7 +120,7 @@ class Laminar:
             raise ValueError(f'Invalid request: {e}')
 
         with connect(
-            "ws://localhost:8000/v2/endpoint/ws",
+            self.ws_url,
             additional_headers={
                 'Authorization': f'Bearer {self.project_api_key}'
             }

lmnr/types.py

@@ -1,21 +1,12 @@
+
 import requests
 import pydantic
-from typing import Any, Union, Optional
+from typing import Union, Optional
 
 class ChatMessage(pydantic.BaseModel):
-    """Chat message object
-
-    Attributes:
-        role (str):
-            Role of the message sender.
-            Can be 'user', 'assistant', or 'system'.
-        content (str): Message content
-    """    
     role: str
     content: str
 
-"""NodeInput is a common type for values shared 
-between nodes in Laminar pipelines."""
 NodeInput = Union[str, list[ChatMessage]] # TypeAlias
 
 class EndpointRunRequest(pydantic.BaseModel):
@@ -25,30 +16,9 @@ class EndpointRunRequest(pydantic.BaseModel):
     metadata: dict[str, str] = pydantic.Field(default_factory=dict)
 
 class EndpointRunResponse(pydantic.BaseModel):
-    """Response object from endpoint run
-
-    Attributes:
-        outputs (dict[str, dict[str, NodeInput]]):
-            Dictionary of output names and their values.
-            Each value is a dictionary with the following keys:
-            - 'value': Output value
-        run_id (str): Stringified UUID of the run. Useful to find traces.
-    """    
     outputs: dict[str, dict[str, NodeInput]]
     run_id: str
 
-    def get_output(self, output_name: str) -> Optional[NodeInput]:
-        """utility to extract the output value by node name
-
-        Args:
-            output_name (str): must match the output node name
-
-        Returns:
-            Optional[NodeInput]: value of the output node if found
-        """        
-        output = self.outputs.get(output_name)
-        return output.get('value') if output else None
-
 class EndpointRunError(Exception):
     error_code: str
     error_message: str
@@ -64,30 +34,19 @@ class EndpointRunError(Exception):
     
     def __str__(self) -> str:
         try:
-            return str({
-                'error_code': self.error_code,
-                'error_message': self.error_message
-            })
+            return str({'error_code': self.error_code, 'error_message': self.error_message})
         except:
             return super().__str__()
-
+        
 class SDKError(Exception):
-    error_message: str
-
-    def __init__(self, error_message: str):
-        self.error_message = error_message
-        super().__init__(self.error_message)
-    
-    def __str__(self) -> str:
-        return super().__str__()
+    def __init__(self, error_mesasge: str):
+        super().__init__(error_mesasge)
 
-class ToolFunctionCall(pydantic.BaseModel):
+class ToolCallRequest(pydantic.BaseModel):
     name: str
     arguments: str
 
 class ToolCall(pydantic.BaseModel):
-    id: str
-    type: str
-    function: ToolFunctionCall
-
-ToolResponse = NodeInput # TypeAlias
+    id: Optional[str]
+    type: Optional[str]
+    function: ToolCallRequest

{lmnr-0.1.3.dist-info → lmnr-0.2.1.dist-info}/LICENSE

@@ -1,3 +1,5 @@
+
+
 Apache License
 Version 2.0, January 2004
 http://www.apache.org/licenses/
@@ -51,7 +53,8 @@ You may add Your own copyright statement to Your modifications and may provide a
 
 END OF TERMS AND CONDITIONS
 
-APPENDIX: How to apply the Apache License to your work.
+
+APPENDIX: How to apply the Apache License to your work
 
 Include a copy of the Apache License, typically in a file called LICENSE, in your work, and consider also including a NOTICE file that references the License.
 

{lmnr-0.1.3.dist-info → lmnr-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lmnr
-Version: 0.1.3
+Version: 0.2.1
 Summary: Python SDK for Laminar AI
 License: Apache-2.0
 Author: lmnr.ai

{lmnr-0.1.3.dist-info → lmnr-0.2.1.dist-info}/RECORD

@@ -1,10 +1,11 @@
-lmnr/__init__.py,sha256=FWUUXOnLBJdG1dHR0shVQsf9WDVppCvB9ibkN0fSfMQ,138
+lmnr/__init__.py,sha256=fUbQpFuP1eK1dymP72SH5tFn-zggGVJkqIPU8X9Iq6w,134
+lmnr/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/cli/__main__.py,sha256=8hDtWlaFZK24KhfNq_ZKgtXqYHsDQDetukOCMlsbW0Q,59
-lmnr/cli/cli.py,sha256=6RwhSPcT9BpppC9Mbs6H01AV7ILqCLcBM5TRAU6-9F4,2828
+lmnr/cli/cli.py,sha256=pzr5LUILi7TcaJIkC-CzmT7RG7-HWApQmUpgK9bc7mI,2847
 lmnr/cli/cookiecutter.json,sha256=PeiMMzCPzDhsapqYoAceYGPI5lOUNimvFzh5KeQv5QE,359
 lmnr/cli/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/cli/parser/nodes/__init__.py,sha256=BNbbfn0WwbFDA6TNhLOaT_Ji69rCL5voUibqMD7Knng,1163
-lmnr/cli/parser/nodes/types.py,sha256=dA3xUARy-SGz-PKENqCsExxoPN3HfS0lNHVjt_qV1dg,5080
+lmnr/cli/parser/nodes/types.py,sha256=fqw_0-szpcZ8G3bADjgG97gCng2DRIkL72nLV11gTP4,5081
 lmnr/cli/parser/parser.py,sha256=UtuupKj2Dh-47HVcYU4PI2s4Erh1gTjKiuGCcc-nkbM,2163
 lmnr/cli/parser/utils.py,sha256=wVaqHVOR9VXl8Og9nkVyCVgHIcgbtYGkDOEGPtmjZ8g,715
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,12 +16,12 @@ lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/state.py,sha256=wTx7jAv
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/engine/task.py,sha256=ware5VIrZvluHH3mpH6h7G0YDk5L0buSQ7s09za4Fro,1200
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/__init__.py,sha256=bsfbNUBYtKv37qzc_GLhSAzBam2lnowP_dlr8pubhcg,80
 lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/nodes/functions.py,sha256=2fLTN6PbhlSPEcrHBSSJESmg__UNMk4Ivs5mz0LqnG8,5169
-lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/{{cookiecutter.pipeline_dir_name}}.py,sha256=jlQhZKJOoWaH0rouuj4gDUJlZRK08-xYPZMPVCrgD0g,2875
-lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/types.py,sha256=khctWhiUhNfTDnWGimI3es1RcK6DYINtmjOyhzNgSXE,1258
-lmnr/sdk/endpoint.py,sha256=_WYouHOULQurYmc_CkKVQuZ8QF5gFLV6TrXJs4SKNbE,6380
-lmnr/types.py,sha256=HmYAP4ATNjOU1hDwEVx3Ihlan0ePUHO1ENNWmjOhGu8,2708
-lmnr-0.1.3.dist-info/LICENSE,sha256=lLTMLT6LFx2zRc2EBXE04hvY9ujHZrHxN3sLZJS7U00,10409
-lmnr-0.1.3.dist-info/METADATA,sha256=4TzGh5G_7bNiiVcD3JDJhIH1ARIXT3GFUAuLRlQua64,2258
-lmnr-0.1.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lmnr-0.1.3.dist-info/entry_points.txt,sha256=Qg7ZRax4k-rcQsZ26XRYQ8YFSBiyY2PNxYfq4a6PYXI,41
-lmnr-0.1.3.dist-info/RECORD,,
+lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/pipelines/{{cookiecutter.pipeline_dir_name}}/{{cookiecutter.pipeline_dir_name}}.py,sha256=WG-ZMofPpGXCx5jdWVry3_XBzcKjqn8ZycFSiWEOBPg,2858
+lmnr/cli/{{cookiecutter.lmnr_pipelines_dir_name}}/types.py,sha256=iWuflMV7TiaBPs6-B-BlrovvWpZgHGGHK0v8rSqER7A,997
+lmnr/sdk/endpoint.py,sha256=tT6-w-mwbh4BAwnj5G0pCVE_Sz8EUzZmpBtacm_T2pE,6359
+lmnr/types.py,sha256=SECA2thlH3pO1F6UvvpyffnwHSdjho4RE2hPYJQH-jE,1444
+lmnr-0.2.1.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
+lmnr-0.2.1.dist-info/METADATA,sha256=aTT3pJgKV_4wxQ6kyjhhk7GuI1xBNTbK-MFviSn3iGo,2258
+lmnr-0.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lmnr-0.2.1.dist-info/entry_points.txt,sha256=Qg7ZRax4k-rcQsZ26XRYQ8YFSBiyY2PNxYfq4a6PYXI,41
+lmnr-0.2.1.dist-info/RECORD,,