olca 0.2.5__tar.gz → 0.2.7__tar.gz

{olca-0.2.5 → olca-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.5
+Version: 0.2.7
 Summary: A Python package for experimental usage of Langchain and Human-in-the-Loop
 Home-page: https://github.com/jgwill/olca
 Author: Jean GUillaume ISabelle
@@ -363,6 +363,7 @@ Requires-Dist: langchain
 Requires-Dist: langchain-openai
 Requires-Dist: langchain-experimental
 Requires-Dist: click
+Requires-Dist: langgraph
 
 # oLCa
 
@@ -389,7 +390,7 @@ pip install olca
 To see the available commands and options, use the `--help` flag:
 
 ```bash
-olca --help
+olca2 --help
 ```
 
 

{olca-0.2.5 → olca-0.2.7}/README.md

@@ -23,7 +23,7 @@ pip install olca
 To see the available commands and options, use the `--help` flag:
 
 ```bash
-olca --help
+olca2 --help
 ```
 
 

{olca-0.2.5 → olca-0.2.7}/olca/olcacli.py

@@ -6,16 +6,6 @@ from langchain import hub
 import argparse
 import yaml
 
-import langsmith 
-# Initialize LangSmith client
-LANGSMITH_API_KEY = os.getenv("LANGSMITH_API_KEY")
-LANGCHAIN_API_KEY = os.getenv("LANGCHAIN_API_KEY")
-if not LANGSMITH_API_KEY and not LANGCHAIN_API_KEY:
-    print("Error: LANGSMITH_API_KEY or LANGCHAIN_API_KEY environment variable is not set.")
-    exit(1)
-client = langsmith.Client(api_key=LANGSMITH_API_KEY or LANGCHAIN_API_KEY)
-
-
 #jgwill/olca1
 #olca1_prompt = hub.pull("jgwill/olca1") #Future use
 #https://smith.langchain.com/hub/jgwill/olca1
@@ -113,8 +103,7 @@ from typing import Literal
 
 from langchain_core.tools import tool
 
-from langchain.agents import create_react_agent
-#from langgraph.prebuilt import create_react_agent
+from langgraph.prebuilt import create_react_agent
 from langgraph.errors import GraphRecursionError
 
 @tool
@@ -163,37 +152,40 @@ def _parse_args():
 
 def main():
     args = _parse_args()
-    olca_config_file = 'olca_config.yaml'
-    olca_new_config_file = 'olca.yml'
+    olca_config_file = 'olca.yml'
     
     if args.init:
-        if os.path.exists(olca_new_config_file) or os.path.exists(olca_config_file):
+        if os.path.exists(olca_config_file):
             print("Error: Configuration file already exists. Cannot run 'olca init'.")
             return
         if args.yes:
-            olca_config_file = olca_new_config_file
+            pass
         else:
             generate_config_example()
             return
     
-    if os.path.exists(olca_new_config_file):
-        olca_config_file = olca_new_config_file
-    elif os.path.exists(olca_config_file):
-        print("Warning: 'olca_config.yaml' is deprecated. Please use 'olca.yml' instead.")
-    else:
+    if not os.path.exists(olca_config_file):
         generate_config_example()
         return
 
     config = load_config(olca_config_file)
     
     # Check for tracing flag in config and CLI
-    tracing_enabled = config.get('tracing', False) or args.tracing
+    tracing_enabled = config.get('tracing', False) or args.tracing or os.getenv("LANGCHAIN_TRACING_V2") == "true"
     if tracing_enabled:
         os.environ["LANGCHAIN_TRACING_V2"] = "true"
         if not os.getenv("LANGCHAIN_API_KEY"):
             print("Error: LANGCHAIN_API_KEY environment variable is required for tracing. Please set it up at : https://smith.langchain.com/settings")
             exit(1)
-    
+        # Initialize LangSmith client
+        import langsmith
+        LANGSMITH_API_KEY = os.getenv("LANGSMITH_API_KEY")
+        LANGCHAIN_API_KEY = os.getenv("LANGCHAIN_API_KEY")
+        if not LANGSMITH_API_KEY and not LANGCHAIN_API_KEY:
+            print("Error: LANGSMITH_API_KEY or LANGCHAIN_API_KEY environment variable is not set.")
+            exit(1)
+        client = langsmith.Client(api_key=LANGSMITH_API_KEY or LANGCHAIN_API_KEY)
+
     try:
             
         api_key_variable = "OPENAI_API_KEY"
@@ -222,7 +214,8 @@ def main():
     
     system_instructions = config.get('system_instructions', '')
     user_input = config.get('user_input', '')
-    model_name=config.get('model_name', "gpt-4o-mini")
+    default_model_id = "gpt-4o-mini"
+    model_name=config.get('model_name', default_model_id)
     recursion_limit=config.get('recursion_limit', 15)
     disable_system_append = _parse_args().disable_system_append
     
@@ -287,8 +280,8 @@ def generate_config_example():
         "temperature": float(input("temperature [0]: ") or 0),
         "human": input("human [true]: ").lower() in ["true", "yes", "y", "1", ""] or True,
         "tracing": input("tracing [true]: ").lower() in ["true", "yes", "y", "1", ""] or True,
-        "system_instructions": input("system_instructions [Hello, I am a chatbot. How can I help you today?]: ") or "Hello, I am a chatbot. How can I help you today?",
-        "user_input": input("user_input [What is the weather in NYC?]: ") or "What is the weather in NYC?"
+        "system_instructions": input("system_instructions [Hello, I am a chatbot. How can I help you today?]: ") or "You are interacting using the human tool addressing carefully what the user is asking.  You carefully go step by step in your interaction with the user.  You are clear and concise in your communication wrapping up the conversation in a coherent manner for the interaction. You make sure to always present what you think is the end-result of the work before quitting the loop and exit the workflow.",
+        "user_input": input("user_input [Interact with me to write a story using the 3 act structure that we will save in ./story/]: ") or "Interact with me to write a story using the 3 act structure that we will save in ./story/"
     }
     with open('olca.yml', 'w') as file:
         yaml.dump(config, file)

{olca-0.2.5 → olca-0.2.7}/olca.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.5
+Version: 0.2.7
 Summary: A Python package for experimental usage of Langchain and Human-in-the-Loop
 Home-page: https://github.com/jgwill/olca
 Author: Jean GUillaume ISabelle
@@ -363,6 +363,7 @@ Requires-Dist: langchain
 Requires-Dist: langchain-openai
 Requires-Dist: langchain-experimental
 Requires-Dist: click
+Requires-Dist: langgraph
 
 # oLCa
 
@@ -389,7 +390,7 @@ pip install olca
 To see the available commands and options, use the `--help` flag:
 
 ```bash
-olca --help
+olca2 --help
 ```
 
 

{olca-0.2.5 → olca-0.2.7}/olca.egg-info/requires.txt

@@ -10,3 +10,4 @@ langchain
 langchain-openai
 langchain-experimental
 click
+langgraph

{olca-0.2.5 → olca-0.2.7}/pyproject.toml

@@ -7,7 +7,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "olca"
-version = "0.2.5"
+version = "0.2.7"
+
 description = "A Python package for experimental usage of Langchain and Human-in-the-Loop"
 readme = "README.md"
 requires-python = ">=3.6"
@@ -28,6 +29,7 @@ dependencies = [
     "langchain-openai",
     "langchain-experimental",
     "click",
+    "langgraph",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",

{olca-0.2.5 → olca-0.2.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='olca',
-    version = "0.2.5",
+    version = "0.2.7",
     author='Jean GUillaume ISabelle',
     author_email='jgi@jgwill.com',
     description='A Python package for experimenting with Langchain agent and interactivity in Terminal modalities.',
@@ -30,7 +30,8 @@ setup(
         'langsmith',
         'langchain-ollama',
         'langgraph',
-        'llm'
+        'llm',
+        'langgraph'
     ],
     classifiers=[
         'Programming Language :: Python :: 3',