Final Changes

data-max-hq · Jul 11, 2024 · 1132fdc · 1132fdc
1 parent cf1caaf
commit 1132fdc
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -4,3 +4,4 @@ README.me
 screenshot-desktop.py
 venv
 .DS_Store
+
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 
 .DS_Store
+
diff --git a/Dockerfile b/Dockerfile
@@ -24,3 +24,4 @@ EXPOSE 8080
 
 # Command to run the supervisor
 CMD ["/usr/bin/supervisord"]
+
diff --git a/Makefile b/Makefile
@@ -5,4 +5,5 @@ run:
 	docker-compose up
 
 clean:
-	docker rm jinaai-demo
+	docker rm jinaai-demo
+
diff --git a/OCRProc.py b/OCRProc.py
@@ -46,3 +46,4 @@ def capture_analyze_and_embed():
     while True:
         capture_analyze_and_embed()
         time.sleep(1)
+
diff --git a/app.py b/app.py
@@ -113,3 +113,4 @@ def add_llm():
 
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=8080, debug=False)
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -21,3 +21,4 @@ services:
 networks:
   app-network:
     driver: bridge
+
diff --git a/query.py b/query.py
@@ -75,3 +75,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+
diff --git a/query_data_AI.py b/query_data_AI.py
@@ -33,3 +33,4 @@ def send_prompt(query_text: str, model=modelllm):
     query_text = input("Enter your question: ")
     model = input("Enter the model you want to use (default is 'qwen2'): ") or modelllm
     send_prompt(query_text, model)
+
diff --git a/requirements.txt b/requirements.txt
@@ -7,4 +7,4 @@ pillow
 einops
 timm
 python-doctr
-Flask
+Flask
diff --git a/save_chromadb.py b/save_chromadb.py
@@ -15,4 +15,5 @@ def add_text_image_data(screenshot_name, text_embedding, image_embedding, extrac
 
     text_collection.add(embeddings=text_embedding, ids=[screenshot_name], documents=extracted_text)
     image_collection.add(embeddings=image_embedding, ids=[screenshot_name])
-    print(f"Processed and saved: {screenshot_name}")
+    print(f"Processed and saved: {screenshot_name}")
+
diff --git a/screenshot-desktop.py b/screenshot-desktop.py
@@ -22,3 +22,4 @@ def capture_screenshots():
 
 if __name__ == "__main__":
     capture_screenshots()
+
diff --git a/supervisord.conf b/supervisord.conf
@@ -15,4 +15,4 @@ command=python3 OCRProc.py
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/OCRProc.err.log
-stdout_logfile=/var/log/OCRProc.out.log
+stdout_logfile=/var/log/OCRProc.out.log
diff --git a/templates/index.html b/templates/index.html
@@ -128,4 +128,4 @@ <h1>ADD LLM</h1>
         <button type="submit">Add LLM</button>
     </form>
 </body>
-</html>
+</html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ README.me
		screenshot-desktop.py
		venv
		.DS_Store
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,4 @@ EXPOSE 8080

		# Command to run the supervisor
		CMD ["/usr/bin/supervisord"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,4 @@ def capture_analyze_and_embed():
		while True:
		capture_analyze_and_embed()
		time.sleep(1)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -113,3 +113,4 @@ def add_llm():

		if __name__ == '__main__':
		app.run(host='0.0.0.0', port=8080, debug=False)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,4 @@ services:
		networks:
		app-network:
		driver: bridge
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,3 +75,4 @@ def main():

		if __name__ == "__main__":
		main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,4 @@ def send_prompt(query_text: str, model=modelllm):
		query_text = input("Enter your question: ")
		model = input("Enter the model you want to use (default is 'qwen2'): ") or modelllm
		send_prompt(query_text, model)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ pillow @@
     einops
     timm
     python-doctr
-    Flask
+    Flask
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,4 @@ def capture_screenshots():

		if __name__ == "__main__":
		capture_screenshots()