Skip to content

Commit ef9d05a

Browse files
committed
Merge branch 'master' into Feature/108-환경변수-및-prompt-경로로-받아-업데이트
2 parents d71537f + 6a5451c commit ef9d05a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4495
-1745
lines changed

.env.example

Lines changed: 94 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
###############################################
44

55
# LLM_PROVIDER=openai
6-
# OPEN_AI_LLM_KEY=
7-
# OPEN_AI_LLM_MODEL=gpt-4o
6+
# OPEN_AI_KEY=sk-proj-----
7+
# OPEN_AI_LLM_MODEL=gpt-4.1
88

99
# LLM_PROVIDER=gemini
1010
# GEMINI_API_KEY=
1111
# GEMINI_LLM_MODEL=gemini-2.0-flash-lite
1212

13-
# LLM_PROVIDER=azure
14-
# AZURE_OPENAI_LLM_ENDPOINT=
15-
# AZURE_OPENAI_LLM_KEY=
16-
# AZURE_OPENAI_LLM_MODEL=
17-
# AZURE_OPENAI_LLM_API_VERSION=
13+
LLM_PROVIDER=azure
14+
AZURE_OPENAI_LLM_ENDPOINT=https://-------.openai.azure.com/
15+
AZURE_OPENAI_LLM_KEY=-
16+
AZURE_OPENAI_LLM_MODEL=gpt4o
17+
AZURE_OPENAI_LLM_API_VERSION=2024-07-01-preview
1818

1919
# LLM_PROVIDER=ollama
2020
# OLLAMA_LLM_BASE_URL=
@@ -36,31 +36,101 @@
3636
########### Embedding API SElECTION ###########
3737
###############################################
3838
# Only used if you are using an LLM that does not natively support embedding (openai or Azure)
39-
# EMBEDDING_ENGINE='openai'
40-
# OPEN_AI_KEY=sk-xxxx
41-
# EMBEDDING_MODEL_PREF='text-embedding-ada-002'
39+
# EMBEDDING_PROVIDER='openai'
40+
# OPEN_AI_EMBEDDING_MODEL='text-embedding-ada-002'
4241

43-
# EMBEDDING_ENGINE='azure'
44-
# AZURE_OPENAI_ENDPOINT=
45-
# AZURE_OPENAI_KEY=
46-
# EMBEDDING_MODEL_PREF='my-embedder-model' # This is the "deployment" on Azure you want to use for embeddings. Not the base model. Valid base model is text-embedding-ada-002
42+
# EMBEDDING_PROVIDER=azure
43+
# AZURE_OPENAI_EMBEDDING_ENDPOINT=https://-------.openai.azure.com/openai/deployments
44+
# AZURE_OPENAI_EMBEDDING_KEY=-
45+
# AZURE_OPENAI_EMBEDDING_MODEL='textembeddingada002' # This is the "deployment" on Azure you want to use for embeddings. Not the base model. Valid base model is text-embedding-ada-002
46+
# AZURE_OPENAI_EMBEDDING_API_VERSION=2023-09-15-preview
4747

48-
# EMBEDDING_ENGINE='ollama'
48+
# EMBEDDING_PROVIDER='ollama'
4949
# EMBEDDING_BASE_PATH='http://host.docker.internal:11434'
50-
# EMBEDDING_MODEL_PREF='nomic-embed-text:latest'
50+
# EMBEDDING_MODEL='nomic-embed-text:latest'
5151
# EMBEDDING_MODEL_MAX_CHUNK_LENGTH=8192
5252

53-
# EMBEDDING_ENGINE='bedrock'
54-
# AWS_BEDROCK_EMBEDDING_ACCESS_KEY_ID=
55-
# AWS_BEDROCK_EMBEDDING_ACCESS_KEY=
56-
# AWS_BEDROCK_EMBEDDING_REGION=us-west-2
57-
# AWS_BEDROCK_EMBEDDING_MODEL_PREF=amazon.embedding-embedding-ada-002:0
53+
EMBEDDING_PROVIDER='bedrock'
54+
AWS_BEDROCK_EMBEDDING_ACCESS_KEY_ID=--
55+
AWS_BEDROCK_EMBEDDING_SECRET_ACCESS_KEY=-/-+-+-
56+
AWS_BEDROCK_EMBEDDING_REGION=us-west-2
57+
AWS_BEDROCK_EMBEDDING_MODEL=amazon.titan-embed-text-v2:0
5858

59-
# EMBEDDING_ENGINE='gemini'
59+
# EMBEDDING_PROVIDER='gemini'
6060
# GEMINI_EMBEDDING_API_KEY=
61-
# EMBEDDING_MODEL_PREF='text-embedding-004'
61+
# EMBEDDING_MODEL='text-embedding-004'
6262

63-
# EMBEDDING_ENGINE='huggingface'
63+
# EMBEDDING_PROVIDER='huggingface'
6464
# HUGGING_FACE_EMBEDDING_REPO_ID=
6565
# HUGGING_FACE_EMBEDDING_MODEL=
66+
6667
# HUGGING_FACE_EMBEDDING_API_TOKEN=
68+
69+
DATAHUB_SERVER = 'http://-.-.-.-:-'
70+
71+
72+
###############################################
73+
######## Database Connector SELECTION #########
74+
###############################################
75+
76+
# clickhouse
77+
# DB_TYPE=clickhouse
78+
# CLICKHOUSE_HOST=_._._._
79+
# CLICKHOUSE_PORT=9000
80+
# CLICKHOUSE_USER=_
81+
# CLICKHOUSE_PASSWORD=_
82+
# CLICKHOUSE_DATABASE=_
83+
84+
# databricks
85+
# DB_TYPE=databricks
86+
# DATABRICKS_HOST=_
87+
# DATABRICKS_HTTP_PATH=_
88+
# DATABRICKS_ACCESS_TOKEN=_
89+
90+
# duckdb
91+
# DB_TYPE=duckdb
92+
# DUCKDB_PATH=./data/duckdb.db
93+
94+
# mariadb
95+
# DB_TYPE=mariadb
96+
# MARIADB_HOST=_
97+
# MARIADB_PORT=3306
98+
# MARIADB_USER=_
99+
# MARIADB_PASSWORD=_
100+
# MARIADB_DATABASE=_
101+
102+
# mysql
103+
# DB_TYPE=mysql
104+
# MYSQL_HOST=_
105+
# MYSQL_PORT=3306
106+
# MYSQL_USER=_
107+
# MYSQL_PASSWORD=_
108+
# MYSQL_DATABASE=_
109+
110+
# oracle
111+
# DB_TYPE=oracle
112+
# ORACLE_HOST=_
113+
# ORACLE_PORT=1521
114+
# ORACLE_USER=_
115+
# ORACLE_PASSWORD=_
116+
# ORACLE_DATABASE=_
117+
# ORACLE_SERVICE_NAME=_
118+
119+
# postgres
120+
# DB_TYPE=postgres
121+
# POSTGRES_HOST=_
122+
# POSTGRES_PORT=5432
123+
# POSTGRES_USER=_
124+
# POSTGRES_PASSWORD=_
125+
# POSTGRES_DATABASE=_
126+
127+
# snowflake
128+
# DB_TYPE=snowflake
129+
# SNOWFLAKE_USER=_
130+
# SNOWFLAKE_PASSWORD=_
131+
# SNOWFLAKE_ACCOUNT=_
132+
133+
# sqlite
134+
# DB_TYPE=sqlite
135+
# SQLITE_PATH=./data/sqlite.db
136+

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ test_lhm/
1010
.cursorignore
1111
.vscode
1212
table_info_db
13-
ko_reranker_local
13+
ko_reranker_local

Dockerfile

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Python 3.10 slim 이미지 기반
2+
FROM python:3.12-slim
3+
4+
# 시스템 라이브러리 설치
5+
RUN apt-get update && apt-get install -y \
6+
build-essential \
7+
curl \
8+
software-properties-common \
9+
git \
10+
libpq-dev \
11+
&& rm -rf /var/lib/apt/lists/*
12+
13+
# 작업 디렉토리 설정
14+
WORKDIR /app
15+
16+
# 의존성 파일 복사 및 설치
17+
COPY requirements.txt .
18+
RUN pip install --no-cache-dir -r requirements.txt
19+
20+
# 전체 서비스 코드 복사
21+
COPY . .
22+
23+
# Python 환경 설정
24+
ENV PYTHONPATH=/app
25+
ENV PYTHONUNBUFFERED=1
26+
27+
# Streamlit 포트 노출
28+
EXPOSE 8501
29+
30+
# Streamlit 실행 명령
31+
CMD ["python", "-c", "from llm_utils.tools import set_gms_server; import os; set_gms_server(os.getenv('DATAHUB_SERVER', 'http://localhost:8080'))"]
32+
CMD ["streamlit", "run", "./interface/streamlit_app.py", "--server.port=8501"]

0 commit comments

Comments
 (0)