Selaa lähdekoodia

varundus 2026-10-29 07:00

ardo 11 tuntia sitten
vanhempi
sitoutus
44ec0b2b9b

+ 0 - 4
main/Dockerfile/rag-api/.dockerignore

@@ -1,4 +0,0 @@
-# välista PyTorch workspace ja prügikast
-main/pytorch-workspace
-**/.Trash-0
-**/.Trash-*

+ 0 - 15
main/Dockerfile/rag-api/Dockerfile

@@ -1,15 +0,0 @@
-FROM python:3.12-slim
-
-# Build-tools
-RUN apt-get update && apt-get install -y \
-    build-essential g++ gcc \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-
-RUN pip install --upgrade pip
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-# MUUDA SEDA RIDA:
-CMD ["python", "-m", "uvicorn", "src.rag_api:app", "--host", "0.0.0.0", "--port", "8000"]

+ 0 - 19
main/Dockerfile/rag-api/LOEMIND.md

@@ -1,19 +0,0 @@
-
-cd /opt/docker-compose/rag-api
-
-cat > .dockerignore << 'EOF'
-# välista PyTorch workspace ja prügikast
-main/pytorch-workspace
-**/.Trash-0
-**/.Trash-*
-EOF
-
-
-docker build -t rag-api .
-docker run -p 8072:8000 rag-api
-
-docker run --rm -p 8072:8000 \
-  -v ~/rag-demo/pdf-pipeline/src:/app/src \
-  rag-api \
-  uvicorn src.rag_api:app --host 0.0.0.0 --port 8000
-

+ 0 - 14
main/Dockerfile/rag-api/requirements.txt

@@ -1,14 +0,0 @@
-fastapi==0.109.0
-uvicorn==0.27.0
-pydantic==2.12.0
-python-multipart==0.0.6
-langchain==0.1.7
-ollama==0.6.0
-openai==1.3.9
-weaviate-client==4.19.0
-pypdf==4.0.1
-python-docx==1.0.1
-requests==2.31.0
-python-dotenv==1.0.0
-psycopg2-binary
-sentence_transformers

+ 1 - 70
main/docker-compose.yml

@@ -78,31 +78,6 @@ services:
     networks:
       - ai_network
 
-# [OpenClaw 2026-09-12] eemaldatud: weaviate:
-#     mem_limit: 4g
-#     image: semitechnologies/weaviate:1.39.2
-#     container_name: weaviate
-#     profiles: ["experimental"]
-#     restart: always
-#     ports:
-#       - "8080:8080"
-#       - "50051:50051"
-#     environment:
-#       TZ: Europe/Tallinn
-#       QUERY_DEFAULTS_LIMIT: 25
-#       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
-#       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
-#       DEFAULT_VECTORIZER_MODULE: 'none'
-#       CLUSTER_HOSTNAME: 'weaviate'
-#       LANG: C.UTF-8
-#     volumes:
-#       - /usr/share/zoneinfo:/usr/share/zoneinfo:ro
-#       - /etc/localtime:/etc/localtime:ro
-#       - weaviate_data:/var/lib/weaviate
-#       - /backups/docker/weaviate:/backups
-#       - /etc/localtime:/etc/localtime
-#     networks:
-#       - ai_network
 
 #   # Qdrant vektoriandmebaas (toetab Open WebUI)
   qdrant:
@@ -137,7 +112,7 @@ services:
     mem_limit: 8g
     image: jupyter/datascience-notebook:python-3.11
     container_name: jupyter
-    restart: always
+    restart: "no"
     ports:
       # [2026-09-26] ainult loopback + Tailscale (LAN-ile mitte avatud)
       - "127.0.0.1:8887:8888"
@@ -199,48 +174,6 @@ services:
       bash -c "pip install jupyter notebook tensorboard transformers datasets huggingface_hub scikit-learn pandas psycopg2-binary &&
       jupyter notebook --ip=0.0.0.0 --port=8888 --no-browser --allow-root --NotebookApp.token='ai_pytorch_2026'"
 
-# [OpenClaw 2026-09-12] eemaldatud: rag-api:
-#     mem_limit: 4g
-#     build:
-#       context: /opt/docker-compose/main/Dockerfile/rag-api
-#       dockerfile: Dockerfile
-#     container_name: rag_api
-#     restart: always
-#     ports:
-#       - "8072:8000"
-#     environment:
-#       LLAMA_CPP_URL: http://100.87.1.24:8070/completion
-#       WEAVIATE_HOST: weaviate
-#       WEAVIATE_HTTP_PORT: 8080
-#       WEAVIATE_URL: http://weaviate:8080
-#       WEAVIATE_CLASS: ScientificArticle
-#       DB_HOST: postgres
-#       DB_PORT: 5432
-#       DB_NAME: pdf_research
-#       DB_USER: osm
-#       DB_PASSWORD: osm
-#       OLLAMA_URL: http://100.87.1.24:11434
-#       TZ: Europe/Tallinn
-#       LANG: C.UTF-8
-#       MARIADB_HOST: mariadb
-#       MARIADB_PORT: 3306
-#       MARIADB_DB: research_mariadb
-#       MARIADB_USER: ai_mariadb_user
-#       MARIADB_PASSWORD: ai_mariadb_pass_2026
-#     volumes:
-#       - /data/docker/rag-api/src:/app/src
-#       - /backups/docker/rag-api:/backups
-#       - /etc/localtime:/etc/localtime
-#     depends_on:
-#       - postgres
-#     networks:
-#       - ai_network
-#     healthcheck:
-#       test: ["CMD", "true"]
-#       interval: 30s
-#       timeout: 10s
-#       retries: 3
-#       start_period: 40s
 
   # Reranker (cross-encoder) — RAG otsingu täpsuse parandaja, tõrjub tabeliprügi
   reranker:
@@ -339,8 +272,6 @@ volumes:
     driver: local
   postgres_data:
     driver: local
-# [OpenClaw 2026-09-12] eemaldatud: weaviate_data:
-#     driver: local
   jupyter_data:
     driver: local
   rocm_pytorch_data:

+ 0 - 2
third/server/openwebui/docker-compose.yml

@@ -86,8 +86,6 @@ services:
       - VECTOR_DB=qdrant
       - QDRANT_URI=http://qdrant:6333
       #- VECTOR_DB=postgres
-      #- VECTOR_DB=weaviate
-      #- WEAVIATE_HOST=http://weaviate:8080
 
       # --- SEARXNG (veebiotsing) ---
       - ENABLE_RAG_WEB_SEARCH=true