olca 0.2.23__py3-none-any.whl → 0.2.25__py3-none-any.whl

olca/olcacli.py

@@ -12,11 +12,9 @@ import yaml
 SYSTEM_PROMPT_APPEND="""
 You do what is above and consider the following when doing the task:
 ---
-* Create any non-existent directories. (./reports, ./log, ./.olca)
-* create a subfolder .olca in the current directory if dont exist and :
-* Write or append instructions to ./.olca/instructions.txt on how to perform tasks (in terms of reflection and action steps. example: cli syntax to execute something).  You read that file to learn how to do your job if it exists.  You update it with what you learned and keep it up to date. You dont erase the content of the file.  If what you find in it is not related to your task, you ignore it. Dont output all these details you do internally to the standard output.  You read it back from time to time to remember what you did and how to make it and what the user wants.  
+* Write or append instructions to ./.olca/instructions.txt on how to perform tasks (in terms of reflection and action steps. example: cli syntax to execute something).  You read that file to learn how to do your job if it exists (example: when you starts, you read this to know more on what you learned to do in previous iterations (as it might not be the first time you ran, this file will intruct you where we are.  You can also deduce this from the user message)).  You update it with what you learned and keep it up to date. You dont erase the content of the file but if what you find in it is not related to your task or is semantically the same, you clean the whole think so its clear. Dont output all these details you do this internally, no output to the stardard output.  You read it back from time to time to remember what you did, learned and how to make it and what the user wants.  
 * Produce a report in ./reports/report-olca-[TIMESTAMP].md
-* Stop and report to the user if repeated errors are encountered.
+* Report to the user if repeated errors are encountered if human tool is accessible (you interact, stating the errors and asking for instructions from the user (you never quit without the user explicitly stating to end the flow)).
 * Output the iteration number and plan to the standard output during each loop.
 * If you are given an issue_id, you commit the work to that issue and push your results (dont output the git push to the standard output).
 * Do not comment on your final results; just output them but keep logging your action steps you do internally (all reflection and action steps).
@@ -27,8 +25,8 @@ You do what is above and consider the following when doing the task:
 * Make sure if you Switched to branch, you switch back to main before the end of your script.
 * Try to observe that you keep doing the same thing over and over again and stop right away if you see that (dont do that if you are developping a story)
 * Be quiet with trivial output in the terminal.
-* Write your plan in ./.olca/plan.md
-* You watch out for basic syntax errors with your args when executing echo commands. (example: Syntax error: Unterminated quoted string)
+* Write and update your plan in ./.olca/plan.md
+* You watch out for basic syntax errors with your args when executing echo commands. (example: Syntax error: Unterminated quoted string, make sure to escape your single and double quotes)
 ----
 REMEMBER: Dont introduce nor conclude, just output results. No comments. you  present in a coherent format without preambles or fluff. Never use the word "determination".
 """
@@ -116,6 +114,24 @@ def get_weather(city: Literal["nyc", "sf"]):
     else:
         raise AssertionError("Unknown city")
 
+def ensure_directories_exist(extra_directories:str=None):
+    directories = ['./reports', './log', './.olca']
+    if extra_directories:
+        directories += extra_directories
+    for directory in directories:
+        if not os.path.exists(directory):
+            os.makedirs(directory)
+            
+def extract_extra_directories_from_olca_config_system_and_user_input(system_instructions, user_input):
+    extra_directories = []
+    #parse thru the 2 inputs and search for patterns such as ./story/ (or any other directory)
+    for input in [system_instructions, user_input]:
+        if input:
+            for word in input.split():
+                if word.startswith("./") and word.endswith("/"):
+                    extra_directories.append(word)
+    return extra_directories
+
 
 def print_stream(stream):
     for s in stream:
@@ -135,7 +151,7 @@ def prepare_input(user_input, system_instructions,append_prompt=True, human=Fals
     ("user", user_input     )
     ]}
         
-    return inputs
+    return inputs,system_instructions,user_input
 
 OLCA_DESCRIPTION = "OlCA (Orpheus Langchain CLI Assistant) (very Experimental and dangerous)"
 OLCA_EPILOG = "For more information: https://github.com/jgwill/orpheuspypractice/wiki/olca"
@@ -261,11 +277,17 @@ def main():
       graph.config = {}
     graph.config["recursion_limit"] = recursion_limit
     
-    inputs = prepare_input(user_input, system_instructions, not disable_system_append, human_switch)
+    inputs,system_instructions,user_input = prepare_input(user_input, system_instructions, not disable_system_append, human_switch)
+    
+    try:    
+        extra_directories=extract_extra_directories_from_olca_config_system_and_user_input(system_instructions, user_input)
+        ensure_directories_exist(extra_directories)
+    except:
+        #We dont want to stop the program if it could not create the extra directories but we want to ensure common olca directories exist
+        ensure_directories_exist()
     
 
     try:
-        os.makedirs('.olca', exist_ok=True)
         print_stream(graph.stream(inputs, stream_mode="values"))
     except GraphRecursionError as e:
         #print(f"Error: {e}")
@@ -281,7 +303,7 @@ 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 "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.",
+            "system_instructions": input("system_instructions [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.]: ") 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:

{olca-0.2.23.dist-info → olca-0.2.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.23
+Version: 0.2.25
 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

olca-0.2.25.dist-info/RECORD

@@ -0,0 +1,10 @@
+olca/__init__.py,sha256=3QyLLAys_KiiDIe-cfO_7QyY7di_qCaCS-sVziW2BOw,23
+olca/fusewill_cli.py,sha256=ZFW2Oeq-gQpAaTIxzsztQWDMv7-R9WJTVcSspbTxpPk,5926
+olca/fusewill_utils.py,sha256=TyyCVRkWeXaS14vh0BXGK-tj0ZPZ3_uQNnAOM-IE9FA,3405
+olca/olcacli.py,sha256=ECx-6S_rU4n_tZBdo0IE_kIr8P_fYmh2dvfxBrt0shI,14215
+olca-0.2.25.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+olca-0.2.25.dist-info/METADATA,sha256=Zx64lKBGLZ9iGGO0DA3a-2K0m7Tw3tJLClWf-n1EEYc,25311
+olca-0.2.25.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+olca-0.2.25.dist-info/entry_points.txt,sha256=njL8YpuSEjiYR2mXIholt03mVAfN8ai12UyH-_uUDho,78
+olca-0.2.25.dist-info/top_level.txt,sha256=bGDtAReS-xlS0F6MM-DyD0IQUqjNdWmgemnM3vNtrpI,5
+olca-0.2.25.dist-info/RECORD,,

olca-0.2.23.dist-info/RECORD

@@ -1,10 +0,0 @@
-olca/__init__.py,sha256=3QyLLAys_KiiDIe-cfO_7QyY7di_qCaCS-sVziW2BOw,23
-olca/fusewill_cli.py,sha256=ZFW2Oeq-gQpAaTIxzsztQWDMv7-R9WJTVcSspbTxpPk,5926
-olca/fusewill_utils.py,sha256=TyyCVRkWeXaS14vh0BXGK-tj0ZPZ3_uQNnAOM-IE9FA,3405
-olca/olcacli.py,sha256=B3uZcl_873zBy4vmXmcyN6Z8ofQA-anzX2aLuvUTSpk,12281
-olca-0.2.23.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-olca-0.2.23.dist-info/METADATA,sha256=q87WC7p0pFuwagrBBs74jxKsS-YmJrbLqxS4VmkiUPs,25311
-olca-0.2.23.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-olca-0.2.23.dist-info/entry_points.txt,sha256=njL8YpuSEjiYR2mXIholt03mVAfN8ai12UyH-_uUDho,78
-olca-0.2.23.dist-info/top_level.txt,sha256=bGDtAReS-xlS0F6MM-DyD0IQUqjNdWmgemnM3vNtrpI,5
-olca-0.2.23.dist-info/RECORD,,