Merge pull request #120 from cagostino/chris/comp_bug

fixing a compile bug where it was dropping the absolute path before a…

Author: cagostino

npcsh/helpers.py

@@ -406,7 +406,6 @@ def get_npc_path(npc_name: str, db_path: str) -> str:
                 query = f"SELECT source_path FROM compiled_npcs WHERE name = {npc_name}"
                 cursor.execute(query)
                 result = cursor.fetchone()
-                print(result)
                 if result:
                     return result[0]
         except Exception as e:

npcsh/npc_compiler.py

@@ -751,7 +751,6 @@ def {tool.tool_name}_execute(inputs):
     def compile(self, npc_file: str):
         self.npc_cache.clear()  # Clear the cache
         self.resolved_npcs.clear()
-
         if isinstance(npc_file, NPC):
             npc_file = npc_file.name + ".npc"
         if not npc_file.endswith(".npc"):
@@ -1044,7 +1043,7 @@ def update_compiled_npcs_table(self, npc_file, parsed_content) -> None:
 
 
 def load_npc_from_file(npc_file: str, db_conn: sqlite3.Connection) -> NPC:
-    # print(npc_file)
+
     if not npc_file.endswith(".npc"):
         # append it just incase
         name += ".npc"
@@ -1964,9 +1963,9 @@ def _execute_ai_model(self, sql: str, model: SQLModel) -> pd.DataFrame:
                     )
 
                     # Optionally pull the synthesized data into a new column
-                    df[
-                        "ai_analysis"
-                    ] = synthesized_df  # Adjust as per what synthesize returns
+                    df["ai_analysis"] = (
+                        synthesized_df  # Adjust as per what synthesize returns
+                    )
 
             return df
 

npcsh/shell_helpers.py

@@ -1165,12 +1165,14 @@ def execute_slash_command(
                 compiled_script = npc_compiler.compile(current_npc)
                 output = f"Compiled NPC profile: {compiled_script}"
             else:  # Compile all NPCs in the directory
-                output = ''
+                output = ""
                 for filename in os.listdir(npc_compiler.npc_directory):
                     if filename.endswith(".npc"):
                         try:
-                            compiled_script = npc_compiler.compile(filename)
-                            output += f"Compiled NPC profile: {compiled_script['name']}\n"
+                            compiled_script = npc_compiler.compile(npc_compiler.npc_directory+'/'+filename)
+                            output += (
+                                f"Compiled NPC profile: {compiled_script['name']}\n"
+                            )
                         except Exception as e:
                             output += f"Error compiling {filename}: {str(e)}\n"
 
@@ -1778,6 +1780,7 @@ def execute_command(
             if npc_name is None:
                 npc_name = "sibiji"  # Default NPC
             npc_path = get_npc_path(npc_name, db_path)
+
             npc = load_npc_from_file(npc_path, db_conn)
         else:
             npc = current_npc
@@ -2705,9 +2708,11 @@ def enter_spool_mode(
                         command_history,
                         conversation_id,
                         "user",
-                        user_prompt
-                        if user_prompt
-                        else f"Please analyze this image: {filename}",
+                        (
+                            user_prompt
+                            if user_prompt
+                            else f"Please analyze this image: {filename}"
+                        ),
                         wd=os.getcwd(),
                         model=model,
                         provider=provider,

setup.py

@@ -57,7 +57,7 @@ def get_setup_message():
 
 setup(
     name="npcsh",
-    version="0.3.16",
+    version="0.3.17",
     packages=find_packages(exclude=["tests*"]),
     install_requires=[
         "redis",