npcsh 1.1.15__tar.gz → 1.1.16__tar.gz

npcsh-1.1.16/MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include npcsh/npc_team *
+include npcsh/npc_team/**/*

{npcsh-1.1.15 → npcsh-1.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.1.15
+Version: 1.1.16
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.1.15 → npcsh-1.1.16}/npcsh/_state.py

@@ -368,10 +368,27 @@ def initialize_base_npcs_if_needed(db_path: str) -> None:
         """
     )
 
-    # Package directories
-    package_dir = os.path.dirname(__file__)
+    # Package directories - use helper that handles PyInstaller bundles
+    package_dir = get_package_dir()
     package_npc_team_dir = os.path.join(package_dir, "npc_team")
 
+    # Debug logging for package path resolution
+    if os.environ.get("NPCSH_DEBUG", "0") == "1":
+        print(f"[DEBUG] Package dir: {package_dir}")
+        print(f"[DEBUG] Package npc_team dir: {package_npc_team_dir}")
+        print(f"[DEBUG] npc_team exists: {os.path.exists(package_npc_team_dir)}")
+        if os.path.exists(package_npc_team_dir):
+            print(f"[DEBUG] npc_team contents: {os.listdir(package_npc_team_dir)}")
+
+    if not os.path.exists(package_npc_team_dir):
+        print(f"Warning: Package npc_team directory not found at {package_npc_team_dir}")
+        # For bundled executables, try to find it
+        if getattr(sys, 'frozen', False):
+            print(f"Running as frozen executable, _MEIPASS: {getattr(sys, '_MEIPASS', 'N/A')}")
+            if hasattr(sys, '_MEIPASS'):
+                print(f"Contents of _MEIPASS: {os.listdir(sys._MEIPASS)}")
+        return
+
     user_npc_team_dir = os.path.expanduser("~/.npcsh/npc_team")
 
     user_jinxs_dir = os.path.join(user_npc_team_dir, "jinxs")
@@ -1121,6 +1138,31 @@ def set_npcsh_initialized() -> None:
 
 
 
+def get_package_dir() -> str:
+    """
+    Get the package directory, handling both normal Python and PyInstaller executables.
+
+    For normal Python: returns os.path.dirname(__file__)
+    For PyInstaller: returns the bundled data directory (sys._MEIPASS/npcsh)
+    """
+    # Check if running as a PyInstaller bundle
+    if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+        # Running as PyInstaller bundle - look for npcsh folder in _MEIPASS
+        meipass = sys._MEIPASS
+        # The package data should be at _MEIPASS/npcsh (based on PyInstaller config)
+        bundled_path = os.path.join(meipass, 'npcsh')
+        if os.path.exists(bundled_path):
+            return bundled_path
+        # Fallback: check if npc_team is directly in _MEIPASS
+        if os.path.exists(os.path.join(meipass, 'npc_team')):
+            return meipass
+        # Last resort: return meipass and let caller handle
+        return meipass
+    else:
+        # Normal Python execution
+        return os.path.dirname(__file__)
+
+
 def file_has_changed(source_path: str, destination_path: str) -> bool:
     """
     Function Description:
@@ -1134,7 +1176,7 @@ def file_has_changed(source_path: str, destination_path: str) -> bool:
         A boolean indicating whether the files are different
     """
 
-  
+
     return not filecmp.cmp(source_path, destination_path, shallow=False)
 
 

{npcsh-1.1.15 → npcsh-1.1.16}/npcsh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.1.15
+Version: 1.1.16
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.1.15 → npcsh-1.1.16}/npcsh.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE
+MANIFEST.in
 README.md
 setup.py
 npcsh/__init__.py

{npcsh-1.1.15 → npcsh-1.1.16}/setup.py

@@ -92,16 +92,28 @@ voice_requirements = [
 
 extra_files = package_files("npcsh/npc_team/")
 
+# Build package_data dict for npc_team files
+def get_package_data_patterns():
+    """Get patterns for all files in npc_team directory."""
+    patterns = []
+    npc_team_path = Path(__file__).parent / "npcsh" / "npc_team"
+    if npc_team_path.exists():
+        for root, dirs, files in os.walk(npc_team_path):
+            rel_root = os.path.relpath(root, Path(__file__).parent / "npcsh")
+            for f in files:
+                patterns.append(os.path.join(rel_root, f))
+    return patterns
+
 setup(
     name="npcsh",
-    version="1.1.15",
+    version="1.1.16",
     packages=find_packages(exclude=["tests*"]),
     install_requires=base_requirements,  # Only install base requirements by default
     extras_require={
         "lite": api_requirements,
         "local": local_requirements,
         "yap": voice_requirements,
-        "all": api_requirements + local_requirements + voice_requirements ,  
+        "all": api_requirements + local_requirements + voice_requirements ,
     },
     entry_points={
         "console_scripts": [
@@ -122,6 +134,15 @@ setup(
         "License :: OSI Approved :: MIT License",
     ],
     include_package_data=True,
+    package_data={
+        "npcsh": [
+            "npc_team/*.npc",
+            "npc_team/*.ctx",
+            "npc_team/jinxs/**/*.jinx",
+            "npc_team/jinxs/**/*",
+            "npc_team/templates/*",
+        ],
+    },
     data_files=[("npcsh/npc_team", extra_files)],
     python_requires=">=3.10",
 )