Merge branch 'main' into feature/front-basement

jamakase · Sep 12, 2024 · 5fec9b2 · 5fec9b2
2 parents 9804cab + 182026d
commit 5fec9b2
Show file tree

Hide file tree

Showing 64 changed files with 2,299 additions and 140 deletions.
diff --git a/docker-compose.ollama.yaml b/docker-compose.ollama.yaml
@@ -111,7 +111,7 @@ services:
     environment:
       FAISS_INDEX_PATH: /data/faiss_index
       OLLAMA_HOST: http://ollama:11434
-      USE_OPENROUTER: false
+      LLM_SOURCE: ollama
       MODEL: llama3.1
     volumes:
       - ./services/ml:/app
@@ -120,9 +120,17 @@ services:
     depends_on:
       - redis
       - ollama
+      - qdrant
     ports:
       - "3001:8000"
 
+  qdrant:
+    image: qdrant/qdrant
+    ports:
+      - "6333:6333"
+    volumes:
+      - ./.cache/qdrant:/data
+
   ollama:
     image: ollama/ollama:latest
     container_name: ollama

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -109,16 +109,27 @@ services:
       context: ./services/ml
       dockerfile: Dockerfile
     environment:
-      FAISS_INDEX_PATH: /data/faiss_index
-      EMBEDDING_MODEL: sentence-transformers/all-mpnet-base-v2
+      LLM_SOURCE: ollama
+      OLLAMA_HOST: http://localhost:11434
+      MODEL_NAME: llama3.1
+      QDRANT_HOST: http://qdrant:6333
+      # EMBEDDING_MODEL: sentence-transformers/all-mpnet-base-v2
     volumes:
       - ./services/ml:/app
       - ./services/ml/data:/data
       - ./.model_cache:/app/model_cache
     depends_on:
       - redis
+      - qdrant
     ports:
       - "3001:8000"
+
+  qdrant:
+    image: qdrant/qdrant
+    ports:
+      - "6333:6333"
+    volumes:
+      - ./.cache/qdrant:/data
 
 volumes:
   postgres_data:
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
@@ -5,14 +5,19 @@ import "./globals.css";
 import { ConfigProvider } from "@/domain/config/ConfigProvider";
 import { headers } from "next/headers";
 
-const robotoMono = Roboto_Mono({ subsets: ["latin", "cyrillic"], weight: ['400', '700'], display: 'swap' });
+const robotoMono = Roboto_Mono({
+  subsets: ["latin", "cyrillic"],
+  weight: ["400", "700"],
+  display: "swap",
+});
 const inter = Inter({ subsets: ["latin", "cyrillic"] });
 
 export const metadata: Metadata = {
   title: "afana-propdoc",
-  description: "Система автоматизации поиска и анализа нормативной документации по строительству объектов",
+  description:
+    "Система автоматизации поиска и анализа нормативной документации по строительству объектов",
   icons: {
-    icon: '/favicon.ico',
+    icon: "/favicon.ico",
   },
 };
 
@@ -21,22 +26,22 @@ export default async function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  // Force dynamic rendering
+  headers();
 
-    // Force dynamic rendering
-    headers();
+  const config = { ENDPOINT: process.env.API_URL ?? "http://localhost:5000" };
 
-    const config = { ENDPOINT: process.env.API_URL ?? 'http://localhost:5000' };
-
   return (
     <html lang="en">
       <head>
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200" />
+        <link
+          rel="stylesheet"
+          href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"
+        />
         <link rel="icon" href="/favicon.ico" sizes="any" />
       </head>
       <body className={inter.className}>
-        <ConfigProvider configData={config}>
-          {children}
-        </ConfigProvider>
+        <ConfigProvider configData={config}>{children}</ConfigProvider>
       </body>
     </html>
   );

diff --git a/helm/charts/.gitignore b/helm/charts/.gitignore
@@ -0,0 +1,26 @@
+# Ignore Helm chart dependencies
+charts/*/charts/
+
+# Ignore packaged Helm charts
+*.tgz
+
+# Ignore Helm chart lock files
+Chart.lock
+
+# Ignore Helm chart values files (optional, if you don't want to version control these)
+# values.yaml
+
+# Ignore temporary files created by Helm
+.helm/
+
+# Ignore rendered templates
+templates/*.yaml
+
+# Ignore Helm release information
+releases/
+
+# Ignore Helm plugin cache
+.cache/
+
+# Ignore any local Helm configuration
+.helmignore
diff --git a/helm/charts/propdoc-backend/Chart.yaml b/helm/charts/propdoc-backend/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: propdoc-backend
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/helm/charts/propdoc-backend/templates/NOTES.txt b/helm/charts/propdoc-backend/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "propdoc-backend.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "propdoc-backend.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "propdoc-backend.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "propdoc-backend.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
diff --git a/helm/charts/propdoc-backend/templates/_helpers.tpl b/helm/charts/propdoc-backend/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "propdoc-backend.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "propdoc-backend.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "propdoc-backend.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "propdoc-backend.labels" -}}
+helm.sh/chart: {{ include "propdoc-backend.chart" . }}
+{{ include "propdoc-backend.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "propdoc-backend.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "propdoc-backend.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "propdoc-backend.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "propdoc-backend.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/helm/charts/propdoc-backend/templates/deployment.yaml b/helm/charts/propdoc-backend/templates/deployment.yaml
@@ -0,0 +1,68 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "propdoc-backend.fullname" . }}
+  labels:
+    {{- include "propdoc-backend.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "propdoc-backend.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "propdoc-backend.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "propdoc-backend.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          livenessProbe:
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/helm/charts/propdoc-backend/templates/hpa.yaml b/helm/charts/propdoc-backend/templates/hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "propdoc-backend.fullname" . }}
+  labels:
+    {{- include "propdoc-backend.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "propdoc-backend.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}