Spaces:
Runtime error
Runtime error
update all files
Browse files- .env +5 -0
- app.py +6 -1
- database.py +10 -0
- docker-compose.yml +10 -5
- requirements.txt +1 -0
.env
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
OPENAI_API_KEY = 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
|
2 |
+
PG_VECTOR_HOST = db # Use the service name 'db' instead of localhost
|
3 |
+
PG_VECTOR_USER = myuser
|
4 |
+
PG_VECTOR_PASSWORD = mypassword
|
5 |
+
PGDATABASE = mydb
|
app.py
CHANGED
@@ -33,7 +33,12 @@ torch.classes.__path__ = [os.path.join(torch.__path__[0], torch.classes.__file__
|
|
33 |
logging.basicConfig(level=logging.INFO)
|
34 |
|
35 |
# Initialize Redis client
|
36 |
-
client = redis.Redis(host="localhost", port=6379, db=0)
|
|
|
|
|
|
|
|
|
|
|
37 |
|
38 |
|
39 |
|
|
|
33 |
logging.basicConfig(level=logging.INFO)
|
34 |
|
35 |
# Initialize Redis client
|
36 |
+
# client = redis.Redis(host="localhost", port=6379, db=0)
|
37 |
+
|
38 |
+
redis_host = os.getenv("REDIS_HOST", "redis-stack")
|
39 |
+
redis_port = int(os.getenv("REDIS_PORT", 6379))
|
40 |
+
|
41 |
+
client = redis.Redis(host=redis_host, port=redis_port, db=0)
|
42 |
|
43 |
|
44 |
|
database.py
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
import os
|
2 |
+
from dotenv import load_dotenv
|
3 |
+
|
4 |
+
load_dotenv()
|
5 |
+
host = os.getenv("PG_VECTOR_HOST")
|
6 |
+
user = os.getenv("PG_VECTOR_USER")
|
7 |
+
password = os.getenv("PG_VECTOR_PASSWORD")
|
8 |
+
COLLECTION_NAME = os.getenv("PGDATABASE")
|
9 |
+
CONNECTION_STRING = "postgresql+psycopg://langchain:langchain@localhost:6024/langchain"
|
10 |
+
#CONNECTION_STRING = f"postgresql+psycopg://{user}:{password}@{host}:6042/{COLLECTION_NAME}"
|
docker-compose.yml
CHANGED
@@ -7,7 +7,10 @@ services:
|
|
7 |
ports:
|
8 |
- "8501:8501"
|
9 |
depends_on:
|
10 |
-
|
|
|
|
|
|
|
11 |
environment:
|
12 |
- REDIS_HOST=redis-stack
|
13 |
- REDIS_PORT=6379
|
@@ -15,14 +18,16 @@ services:
|
|
15 |
- app_network
|
16 |
|
17 |
redis-stack:
|
18 |
-
image: redis/redis-stack
|
19 |
container_name: redis_stack
|
20 |
restart: always
|
21 |
-
ports:
|
22 |
-
- "6379:6379"
|
23 |
-
- "8001:8001" # RedisInsight web UI
|
24 |
networks:
|
25 |
- app_network
|
|
|
|
|
|
|
|
|
|
|
26 |
|
27 |
networks:
|
28 |
app_network:
|
|
|
7 |
ports:
|
8 |
- "8501:8501"
|
9 |
depends_on:
|
10 |
+
redis-stack:
|
11 |
+
condition: service_healthy # Wait for Redis to be ready
|
12 |
+
env_file:
|
13 |
+
- .env # Load environment variables from .env file
|
14 |
environment:
|
15 |
- REDIS_HOST=redis-stack
|
16 |
- REDIS_PORT=6379
|
|
|
18 |
- app_network
|
19 |
|
20 |
redis-stack:
|
21 |
+
image: redis/redis-stack:latest
|
22 |
container_name: redis_stack
|
23 |
restart: always
|
|
|
|
|
|
|
24 |
networks:
|
25 |
- app_network
|
26 |
+
healthcheck:
|
27 |
+
test: ["CMD", "redis-cli", "ping"]
|
28 |
+
interval: 5s
|
29 |
+
timeout: 3s
|
30 |
+
retries: 5
|
31 |
|
32 |
networks:
|
33 |
app_network:
|
requirements.txt
CHANGED
@@ -150,3 +150,4 @@ xlrd==2.0.1
|
|
150 |
XlsxWriter==3.2.2
|
151 |
yarl==1.18.3
|
152 |
zstandard==0.23.0
|
|
|
|
150 |
XlsxWriter==3.2.2
|
151 |
yarl==1.18.3
|
152 |
zstandard==0.23.0
|
153 |
+
IPython
|