ziya 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

app/agents/agent.py

@@ -67,47 +67,10 @@ def get_combined_docs_from_files(files) -> str:
     print("--------------------------------------------------------")
     return combined_contents
 
-# def get_combined_document_contents_from_included_dirs(included_relative_dirs) -> str:
-#     user_codebase_dir: str = os.environ["ZIYA_USER_CODEBASE_DIR"]
-#     print(f"Reading user's current codebase: {user_codebase_dir}")
-#
-#     combined_contents: str = ""
-#     ignored_patterns: List[str] = get_ignored_patterns(user_codebase_dir)
-#     all_files: List[str] = get_complete_file_list(user_codebase_dir, ignored_patterns, included_relative_dirs)
-#     print("all_files")
-#     print(all_files)
-#
-#     print_file_tree(all_files)
-#
-#     seen_dirs: Set[str] = set()
-#     for file_path in all_files:
-#         try:
-#             docs = TextLoader(file_path).load()
-#             for doc in docs:
-#                 combined_contents += f"File: {file_path}\n{doc.page_content}\n\n"
-#             dir_path = os.path.dirname(file_path)
-#             if dir_path not in seen_dirs:
-#                 seen_dirs.add(dir_path)
-#         except Exception as e:
-#             print(f"Skipping file {file_path} due to error: {e}")
-#
-#     print("--------------------------------------------------------")
-#     print(f"Ignoring following paths based on gitIgnore and other defaults: {ignored_patterns}")
-#     print("--------------------------------------------------------")
-#     print(f"Codebase word count: {len(combined_contents.split()):,}")
-#     token_count = len(tiktoken.get_encoding("cl100k_base").encode(combined_contents))
-#     print(f"Codebase token count: {token_count:,}")
-#     print(f"Max Claude Token limit: 200,000")
-#     print("--------------------------------------------------------")
-#     return combined_contents
-
-# prompt = conversational_prompt.partial(
-#     # codebase=get_combined_document_contents()
-# )
+
 llm_with_stop = model.bind(stop=["</tool_input>"])
 
 def extract_codebase(x):
-    # return get_combined_docs_from_files(x["config"].get("include_dirs", ['./']))
     return get_combined_docs_from_files(x["config"].get("files", []))
 
 agent = (

app/agents/prompts.py

@@ -3,15 +3,22 @@ from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
 # import pydevd_pycharm
 
 template = """
-You are an excellent coder. Help the user with their coding tasks. You are given the entire codebase
- of the user in your context. It is in the format like below where first line has the File path and then the content follows. 
+You are an excellent coder. Help the user with their coding tasks. You are given the codebase
+of the user in your context. 
+
+IMPORTANT: When recommending code changes, always format your response as a git diff unless the user specifies otherwise.
+
+The codebase is provided at the end of this prompt in a specific format. 
+The code that the user has given to you for context is in the format like below where first line has the File path and then the content follows.
+Each file starts with "File: <filepath>" followed by its content on subsequent lines. 
 
 File: <filepath>
 <Content of the file>. 
 
-Now below is the current codebase of the user: 
- 
+Below is the current codebase of the user: 
+
 {codebase}
+
 """
 
 conversational_prompt = ChatPromptTemplate.from_messages(
@@ -27,23 +34,4 @@ conversational_prompt = ChatPromptTemplate.from_messages(
 
 def parse_output(message):
     text = message.content
-    # pydevd_pycharm.settrace('localhost', port=61565, stdoutToServer=True, stderrToServer=True)
-    # print('----TEXT START----')
-    # print(text)
-    # print('----TEXT END----')
-    # if "</tool>" in text:
-    #     tool, tool_input = text.split("</tool>")
-    #     _tool = tool.split("<tool>")[1]
-    #     _tool_input = tool_input.split("<tool_input>")[1]
-    #
-    #     if _tool == "write_file":
-    #         _tool_input = json.loads(_tool_input)
-    #         # newline_index = _tool_input.find('\n')
-    #         # file_path = _tool_input[:newline_index]
-    #         # text = _tool_input[newline_index + 1:]
-    #     if "</tool_input>" in _tool_input:
-    #         _tool_input = _tool_input.split("</tool_input>")[0]
-    #
-    #     return AgentAction(tool=_tool, tool_input=_tool_input, log=text)
-    # else:
     return AgentFinish(return_values={"output": text}, log=text)

pyproject.toml

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

templates/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "/static/css/main.987be07e.css",
-    "main.js": "/static/js/main.e5e64dae.js",
+    "main.css": "/static/css/main.36c086ff.css",
+    "main.js": "/static/js/main.3967f091.js",
     "static/media/fa-solid-900.ttf": "/static/media/fa-solid-900.bacd5de623fb563b961a.ttf",
     "static/media/fa-brands-400.ttf": "/static/media/fa-brands-400.60127e352b7a11f7f1bc.ttf",
     "static/media/fa-solid-900.woff2": "/static/media/fa-solid-900.4d986b00ff9ca3828fbd.woff2",
@@ -11,11 +11,11 @@
     "static/media/fa-v4compatibility.ttf": "/static/media/fa-v4compatibility.c8e090db312b0bea2aa2.ttf",
     "static/media/fa-v4compatibility.woff2": "/static/media/fa-v4compatibility.cf7f5903d06b79ad60f1.woff2",
     "index.html": "/index.html",
-    "main.987be07e.css.map": "/static/css/main.987be07e.css.map",
-    "main.e5e64dae.js.map": "/static/js/main.e5e64dae.js.map"
+    "main.36c086ff.css.map": "/static/css/main.36c086ff.css.map",
+    "main.3967f091.js.map": "/static/js/main.3967f091.js.map"
   },
   "entrypoints": [
-    "static/css/main.987be07e.css",
-    "static/js/main.e5e64dae.js"
+    "static/css/main.36c086ff.css",
+    "static/js/main.3967f091.js"
   ]
 }

templates/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Ziya - Code Assistant</title><link rel="icon" href="/favicon.ico" type="image/x-icon"><script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script><script defer="defer" src="/static/js/main.e5e64dae.js"></script><link href="/static/css/main.987be07e.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Ziya - Code Assistant</title><link rel="icon" href="/favicon.ico" type="image/x-icon"><script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script><script defer="defer" src="/static/js/main.3967f091.js"></script><link href="/static/css/main.36c086ff.css" rel="stylesheet"></head><body><div id="root"></div></body></html>