ziya 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

app/main.py

@@ -48,12 +48,38 @@ def check_version_and_upgrade():
         logger.info(f"Ziya version {current_version} is up to date.")
 
 
+def is_package_installed_with_pip(package_name: str) -> bool:
+    try:
+        subprocess.check_call([sys.executable, '-m', 'pip', 'show', package_name], stdout=subprocess.DEVNULL,
+                              stderr=subprocess.DEVNULL)
+        return True
+    except subprocess.CalledProcessError:
+        return False
+
+
+def is_package_installed_with_pipx(package_name: str) -> bool:
+    try:
+        subprocess.check_call(['pipx', 'list'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        result = subprocess.run(['pipx', 'list'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        return package_name in result.stdout.decode()
+    except subprocess.CalledProcessError:
+        return False
+
+
 def update_package(current_version: str, latest_version: Optional[str]) -> None:
     try:
         logger.info(f"Updating ziya from {current_version} to {latest_version}")
-        subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', 'ziya'])
-        logger.info("Update completed. Next time you run ziya it will be with the latest version.")
 
+        if is_package_installed_with_pip('ziya'):
+            logger.info("Package installed via pip")
+            subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', 'ziya'])
+        elif is_package_installed_with_pipx('ziya'):
+            logger.info("Package installed via pipx")
+            subprocess.check_call(['pipx', 'upgrade', 'ziya'])
+        else:
+            logger.info("ziya is not installed with pip or pipx.")
+
+        logger.info("Update completed. Next time you run ziya it will be with the latest version.")
     except Exception as e:
         logger.info(f"Unexpected error upgrading ziya: {e}")
 
@@ -65,7 +91,9 @@ def print_version():
 
 def start_server(args):
     os.chdir(os.path.dirname(os.path.abspath(__file__)))
-    serve(port=args.port)
+    # Override the default server location from 127.0.0.1 to 0.0.0.0
+    # This allows the server to be accessible from other machines on the network
+    serve(host="0.0.0.0", port=args.port)
 
 
 def main():

app/server.py

@@ -3,6 +3,7 @@ from typing import Dict, Any, List, Tuple
 
 import tiktoken
 from fastapi import FastAPI, Request
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from langserve import add_routes
@@ -16,6 +17,15 @@ from app.utils.directory_util import get_ignored_patterns
 from app.utils.gitignore_parser import parse_gitignore_patterns
 
 app = FastAPI()
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
 app.mount("/static", StaticFiles(directory="../templates/static"), name="static")
 templates = Jinja2Templates(directory="../templates")
 

app/utils/gitignore_parser.py

@@ -119,9 +119,10 @@ class IgnoreRule(collections.namedtuple('IgnoreRule_', IGNORE_RULE_FIELDS)):
     def match(self, abs_path: Union[str, Path]):
         matched = False
         if self.base_path:
-            if str(abs_path).startswith(str(self.base_path)):
+            try:
                 rel_path = str(_normalize_path(abs_path).relative_to(self.base_path))
-            else:
+            except ValueError:
+                # If the path is not a subpath of the base path, treat it as a separate path
                 rel_path = str(_normalize_path(abs_path))
         else:
             rel_path = str(_normalize_path(abs_path))
@@ -212,4 +213,4 @@ def _normalize_path(path: Union[str, Path]) -> Path:
     Note that this simplifies paths by removing double slashes, `..`, `.` etc. like
     `Path.resolve()` does.
     """
-    return Path(abspath(path))
+    return Path(abspath(path))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ziya"
-version = "0.1.11"
+version = "0.1.13"
 description = ""
 authors = ["Vishnu Krishnaprasad <vishnukool@gmail.com>"]
 readme = "README.md"

{ziya-0.1.11.dist-info → ziya-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ziya
-Version: 0.1.11
+Version: 0.1.13
 Summary: 
 Author: Vishnu Krishnaprasad
 Author-email: vishnukool@gmail.com
@@ -78,9 +78,7 @@ ziya
 
 ### Options
 
-`--exclude`: Comma-separated list of files or directories or file suffix patterns to exclude from the codebase. Eg: `--exclude 'tst,build,*.py'`
-
-`--include`: Comma-separated list of directories to include. By default, it only searches for current directory for code files, but you can specify a list of subset directories under current folder to search instead of the entire folder. Eg: `--include='app,src/mappers'`
+`--exclude`: Comma-separated list of files or directories or file suffix patterns to exclude from the codebase. Eg: "--exclude 'tst,build,*.py'"
 
 `--profile`: AWS profile to use for the Bedrock LLM.
 
@@ -91,3 +89,4 @@ ziya
 ```bash
 ziya --include='app,src/mappers' --exclude='tst,build,*.py' --profile=ziya --model=sonnet --port=8080
 ```
+

{ziya-0.1.11.dist-info → ziya-0.1.13.dist-info}/RECORD

@@ -2,16 +2,16 @@ app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/agents/agent.py,sha256=l_GmvQ_G4eKwd_9h4tH325jnQDS3_-NYFAX2yKcypPw,5363
 app/agents/prompts.py,sha256=LMwNzbYexns8er7mlF5VKhlobYH9yy37HR-axL_DNkk,1747
-app/main.py,sha256=jm78WN0opAp-lk78mUTg7a-n68E322Jwy2fUosoIphE,2819
-app/server.py,sha256=VqPlRQ-_14eI4Y9kIkcHrGW5uMxL6MPesD9bZrBvanQ,3199
+app/main.py,sha256=WZlsI0_CKi37BawhHohGt9J3HJ7U_QeFwr16ed536Mo,4052
+app/server.py,sha256=nzm94XVuntOQgM61ivQGAMghG8HexeCSI29sziVSocI,3397
 app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/utils/directory_util.py,sha256=2zxsSxSOZKesjhgjF3KguY__fC9XkjxHHnDbcxtnhXk,2762
-app/utils/gitignore_parser.py,sha256=DnDqf7K6neeLTChcGD-x4g1UQ32pzgHh0qf7oP1mEDk,7425
+app/utils/gitignore_parser.py,sha256=Li3hQd60eclIuN2qxn8-NQ5sxRyMcnS88DFUxVHdx-A,7487
 app/utils/langchain_validation_util.py,sha256=RgmKayKMApvUA7SPF_DrBAcYdIzzLUVJfnOwTSc1Eug,527
 app/utils/logging_utils.py,sha256=8JEcc1t7L-a0G4HLmM8zFydNNSOd5l2-gkTxviLQUns,280
 app/utils/print_tree_util.py,sha256=O4Rb-GS8UODxfH7Z6bZGsr-opG6QLmvdaU1im5kh4IA,1419
 app/utils/version_util.py,sha256=NcvMWIImJDcO9K5OMX6jJD4q6Zb8Y117Mu8sWIkhxEc,631
-pyproject.toml,sha256=wnlS-7gHbMeuGR9mljgmA-cU99zttwa0ekfcMyhrvvo,804
+pyproject.toml,sha256=kyROW3FoBvl30o2ASGTIteNmHl-jlATvWlknhEFIAFc,804
 scripts.py,sha256=70BOvYoboMhl3Bxjy73m1ozmI8UV8JZVyi2RwUptkK8,809
 templates/.DS_Store,sha256=IWzGxsqGRcdoSHwV5Q9YF26GaZGnTClZWzKJgx33UyY,6148
 templates/asset-manifest.json,sha256=-cGZTauN08338NqyS6yzTSJs0xFusjbbXrLN7PJiAuE,1157
@@ -30,8 +30,8 @@ templates/static/media/fa-solid-900.4d986b00ff9ca3828fbd.woff2,sha256=rhfBavvqIW
 templates/static/media/fa-solid-900.bacd5de623fb563b961a.ttf,sha256=tJkNDQxfXTjWLpNu6hIGdOWEx-6o3O44qXXAz5o3U5s,420332
 templates/static/media/fa-v4compatibility.c8e090db312b0bea2aa2.ttf,sha256=_49SX7BQxdJFGczI9XI9hbLlHt0_m8ZUivVa663U8mk,10832
 templates/static/media/fa-v4compatibility.cf7f5903d06b79ad60f1.woff2,sha256=x6hp-sopnRW-EKAfGdB2WnxNRtiSLZuTFyNcHkpvCYI,4792
-ziya-0.1.11.dist-info/LICENSE,sha256=8CfErGEG13yY1Z-CDlIhAQawX2KOv-QI_2Ge2z6x8SU,1064
-ziya-0.1.11.dist-info/METADATA,sha256=gfAXSpCKiQ0LeRNXjs7vBNYxdTwHFPpewZH2-v5GgOo,2978
-ziya-0.1.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ziya-0.1.11.dist-info/entry_points.txt,sha256=6-KUolj5XXeOPVCJGTJgUL_3lDVGxG-YtK5BTvFPyBg,147
-ziya-0.1.11.dist-info/RECORD,,
+ziya-0.1.13.dist-info/LICENSE,sha256=8CfErGEG13yY1Z-CDlIhAQawX2KOv-QI_2Ge2z6x8SU,1064
+ziya-0.1.13.dist-info/METADATA,sha256=HPDvbeEfsdrRh6YqSsiM7M8tfJ23V982HsAb7ky-0Ps,2706
+ziya-0.1.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ziya-0.1.13.dist-info/entry_points.txt,sha256=6-KUolj5XXeOPVCJGTJgUL_3lDVGxG-YtK5BTvFPyBg,147
+ziya-0.1.13.dist-info/RECORD,,