ziya 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

app/main.py

@@ -1,10 +1,17 @@
+import argparse
 import os
+import subprocess
+import sys
+from typing import Optional
+
 from langchain_cli.cli import serve
-import argparse
 
-def main():
-    os.environ["ZIYA_USER_CODEBASE_DIR"] = os.getcwd()
+from app.utils.logging_utils import logger
+from app.utils.langchain_validation_util import validate_langchain_vars
+from app.utils.version_util import get_current_version, get_latest_version
+
 
+def parse_arguments():
     parser = argparse.ArgumentParser(description="Run with custom options")
     parser.add_argument("--exclude", default=[], type=lambda x: x.split(','),
                         help="List of files or directories to exclude (e.g., --exclude 'tst,build,*.py')")
@@ -13,15 +20,21 @@ def main():
     parser.add_argument("--profile", type=str, default=None,
                         help="AWS profile to use (e.g., --profile ziya)")
     parser.add_argument("--model", type=str, choices=["sonnet", "haiku", "opus"], default="sonnet",
-                        help="AWS Bedrock Model to use  (e.g., --model sonnet)")
+                        help="AWS Bedrock Model to use (e.g., --model sonnet)")
     parser.add_argument("--port", type=int, default=6969,
                         help="Port number to run Ziya frontend on (e.g., --port 8080)")
-    args = parser.parse_args()
+    parser.add_argument("--version", action="store_true",
+                        help="Prints the version of Ziya")
+    return parser.parse_args()
 
-    additional_excluded_dirs = ','.join([item for item in args.exclude])
+
+def setup_environment(args):
+    os.environ["ZIYA_USER_CODEBASE_DIR"] = os.getcwd()
+
+    additional_excluded_dirs = ','.join(args.exclude)
     os.environ["ZIYA_ADDITIONAL_EXCLUDE_DIRS"] = additional_excluded_dirs
 
-    additional_included_dirs = ','.join([item for item in args.include])
+    additional_included_dirs = ','.join(args.include)
     os.environ["ZIYA_ADDITIONAL_INCLUDE_DIRS"] = additional_included_dirs
 
     if args.profile:
@@ -29,10 +42,49 @@ def main():
     if args.model:
         os.environ["ZIYA_AWS_MODEL"] = args.model
 
-    langchain_serve_directory = os.path.dirname(os.path.abspath(__file__))
-    os.chdir(langchain_serve_directory)
+
+def check_version_and_upgrade():
+    current_version = get_current_version()
+    latest_version = get_latest_version()
+
+    if latest_version and current_version != latest_version:
+        update_package(current_version, latest_version)
+    else:
+        logger.info(f"Ziya version {current_version} is up to date.")
+
+
+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.")
+
+    except Exception as e:
+        logger.info(f"Unexpected error upgrading ziya: {e}")
+
+
+def print_version():
+    current_version = get_current_version()
+    print(f"Ziya version {current_version}")
+
+
+def start_server(args):
+    os.chdir(os.path.dirname(os.path.abspath(__file__)))
     serve(port=args.port)
 
 
+def main():
+    args = parse_arguments()
+
+    if args.version:
+        print_version()
+        return
+
+    check_version_and_upgrade()
+    validate_langchain_vars()
+    setup_environment(args)
+    start_server(args)
+
+
 if __name__ == "__main__":
-    main()
+    main()

app/utils/langchain_validation_util.py

@@ -0,0 +1,16 @@
+import os
+import sys
+
+from app.utils.logging_utils import logger
+
+
+def validate_langchain_vars():
+    langchain_vars = [var for var in os.environ if var.startswith("LANGCHAIN_")]
+    if langchain_vars:
+        logger.error("Langchain environment variables are set:")
+        for var in langchain_vars:
+            logger.error(f"- {var}")
+        logger.error(
+            "To prevent accidentally sending confidential code to a 3rd party, please unset these variables before "
+            "running Ziya.")
+        sys.exit(1)

app/utils/version_util.py

@@ -0,0 +1,23 @@
+import requests
+from packaging import version
+import subprocess
+import sys
+from typing import Optional
+
+
+def get_latest_version() -> Optional[str]:
+    try:
+        response = requests.get('https://pypi.org/pypi/ziya/json')
+        response.raise_for_status()
+        return str(version.parse(response.json()['info']['version']))
+    except requests.exceptions.RequestException:
+        return None
+
+
+def update_package() -> None:
+    subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', 'ziya'])
+
+
+def get_current_version() -> str:
+    from importlib.metadata import version
+    return str(version('ziya'))

pyproject.toml

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

{ziya-0.1.4.dist-info → ziya-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ziya
-Version: 0.1.4
+Version: 0.1.6
 Summary: 
 Author: Vishnu Krishnaprasad
 Author-email: vishnukool@gmail.com

{ziya-0.1.4.dist-info → ziya-0.1.6.dist-info}/RECORD

@@ -2,21 +2,23 @@ app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/agents/agent.py,sha256=Qb1xgZ7fkpLSbKzSsygze7UL2H8jMtnOiTD-Gm8uXWU,4349
 app/agents/prompts.py,sha256=O54rH2KupyY7ZSjPEvm3j9DSGjdL3jJOz8F9PTcePQQ,1674
-app/main.py,sha256=muUq4TlNUHJPP4AXaVrMsWUzbNo_aYk6XLDk2wAMqgU,1705
+app/main.py,sha256=DHY_hRbnGAsILHac8uJWdJJAg-9HGr6Dl6A27RnBfK4,3146
 app/server.py,sha256=YTEHYUsFQhgkGRHZ_y7K3Ju3SmUIbVxLSdgrgi1BuEU,676
 app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/utils/directory_util.py,sha256=fdYumUhLcmbaGI0OvGY13CkQSKxrCZi6ZNwhz9_oJmQ,2512
 app/utils/gitignore_parser.py,sha256=ksAAvXr8_GFh94cvOdkLmES5k3xxNxW2_tQuQtialIA,7496
+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
-pyproject.toml,sha256=-81QM7yQm3lDFoO6M5dgR-mbMITwEpUfc3iZbGh0W9g,716
+app/utils/version_util.py,sha256=NcvMWIImJDcO9K5OMX6jJD4q6Zb8Y117Mu8sWIkhxEc,631
+pyproject.toml,sha256=MZq9r6D3Jr1EPgOD4C6kriMoCpgrUeZO2ZYXX_VoBOk,716
 static/app.js,sha256=qz2F0e5LxuVFI3MXWvcON9l1cN0J_ODdQOwbgT3ZqWA,3622
 static/favicon.ico,sha256=HgB8xAZdDHFK2lODUsp2H_Dds_i14pnpydx7NEJrNrU,15086
 static/sendPayload.js,sha256=VnypSWF7t8bv83026LGU3GMyr9tMrp05hmWATcbCG4k,1956
 static/ziya.css,sha256=OaieSXw_7LOk0WNNi-1mPsAaS3rOxhHycKFgFDoiZB0,1395
 templates/index.html,sha256=8auy9lGLdcDzBkzpjYB1ygrAVbXpo0rqQ8p1FgMEeck,800
-ziya-0.1.4.dist-info/LICENSE,sha256=8CfErGEG13yY1Z-CDlIhAQawX2KOv-QI_2Ge2z6x8SU,1064
-ziya-0.1.4.dist-info/METADATA,sha256=e57AePaIYYdGb5OgVjJbfoiaW1f9BWBI4WwstFY5Q-U,2921
-ziya-0.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ziya-0.1.4.dist-info/entry_points.txt,sha256=1HspxMqCYRli3SqM6CqmT6gsW_G14G4ab3sHlrYUCAA,38
-ziya-0.1.4.dist-info/RECORD,,
+ziya-0.1.6.dist-info/LICENSE,sha256=8CfErGEG13yY1Z-CDlIhAQawX2KOv-QI_2Ge2z6x8SU,1064
+ziya-0.1.6.dist-info/METADATA,sha256=DmNfRTAI_cgCxdsh5bM3a3Vrj8nhlXm_ta488VCDfyA,2921
+ziya-0.1.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ziya-0.1.6.dist-info/entry_points.txt,sha256=1HspxMqCYRli3SqM6CqmT6gsW_G14G4ab3sHlrYUCAA,38
+ziya-0.1.6.dist-info/RECORD,,