kabudadada commited on
Commit
9d25df1
·
1 Parent(s): bd7e2c0

Fix dependency conflicts by removing version constraints and using pip instead of conda

Browse files
Files changed (2) hide show
  1. Dockerfile +51 -10
  2. environment.yml +65 -98
Dockerfile CHANGED
@@ -1,25 +1,66 @@
1
- FROM continuumio/miniconda3:latest
2
 
3
  RUN useradd -m -u 1000 user
4
  USER user
5
  ENV PATH="/home/user/.local/bin:$PATH"
6
  WORKDIR /app
7
 
8
- # Copy environment.yml and install dependencies
9
- COPY --chown=user ./environment.yml environment.yml
10
- RUN conda env create -f environment.yml && \
11
- conda clean -afy
12
-
13
  # Copy application files
14
  COPY --chown=user . /app
15
  ENV PYTHONPATH=/app/Foam-Agent/source:$PYTHONPATH
16
 
17
- # Install additional MCP dependencies
18
- RUN /opt/conda/envs/openfoamAgent/bin/pip install fastapi uvicorn[standard] fastmcp
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
 
20
  EXPOSE 7860
21
  ENV MCP_TRANSPORT=http
22
  ENV MCP_PORT=7860
23
 
24
- # Activate conda environment and run
25
- CMD ["/opt/conda/envs/openfoamAgent/bin/python", "Foam-Agent/mcp_output/start_mcp.py"]
 
1
+ FROM python:3.11
2
 
3
  RUN useradd -m -u 1000 user
4
  USER user
5
  ENV PATH="/home/user/.local/bin:$PATH"
6
  WORKDIR /app
7
 
 
 
 
 
 
8
  # Copy application files
9
  COPY --chown=user . /app
10
  ENV PYTHONPATH=/app/Foam-Agent/source:$PYTHONPATH
11
 
12
+ # Install dependencies using pip
13
+ RUN pip install --no-cache-dir --upgrade pip && \
14
+ pip install --no-cache-dir \
15
+ fastapi \
16
+ uvicorn[standard] \
17
+ fastmcp \
18
+ pydantic \
19
+ python-dotenv \
20
+ faiss-cpu \
21
+ pyyaml \
22
+ requests \
23
+ numpy \
24
+ langchain \
25
+ langchain-core \
26
+ langchain-openai \
27
+ langchain-community \
28
+ langchain-aws \
29
+ langchain-anthropic \
30
+ langchain-ollama \
31
+ langchain-text-splitters \
32
+ langchain-experimental \
33
+ langgraph \
34
+ langgraph-checkpoint \
35
+ langgraph-sdk \
36
+ langserve \
37
+ langsmith \
38
+ openai \
39
+ anthropic \
40
+ boto3 \
41
+ botocore \
42
+ httpx \
43
+ httpcore \
44
+ aiohttp \
45
+ aiohappyeyeballs \
46
+ aiosignal \
47
+ pandas \
48
+ scikit-learn \
49
+ matplotlib \
50
+ seaborn \
51
+ click \
52
+ tqdm \
53
+ tenacity \
54
+ tiktoken \
55
+ orjson \
56
+ msgpack \
57
+ zstandard \
58
+ sqlalchemy \
59
+ marshmallow \
60
+ gitingest
61
 
62
  EXPOSE 7860
63
  ENV MCP_TRANSPORT=http
64
  ENV MCP_PORT=7860
65
 
66
+ CMD ["python", "Foam-Agent/mcp_output/start_mcp.py"]
 
environment.yml CHANGED
@@ -3,102 +3,69 @@ channels:
3
  - conda-forge
4
  - defaults
5
  dependencies:
6
- - _libgcc_mutex=0.1
7
- - _openmp_mutex=4.5
8
- - bzip2=1.0.8
9
- - ca-certificates=2025.1.31
10
- - expat=2.6.4
11
- - ld_impl_linux-64=2.43
12
- - libexpat=2.6.4
13
- - libffi=3.4.6
14
- - libgcc=14.2.0
15
- - libgcc-ng=14.2.0
16
- - libgomp=14.2.0
17
- - liblzma=5.6.4
18
- - liblzma-devel=5.6.4
19
- - libnsl=2.0.1
20
- - libsqlite=3.46.0
21
- - libuuid=1.41.5
22
- - libzlib=1.2.13
23
- - ncurses=6.5
24
- - openssl=3.4.1
25
- - pip=25.0.1
26
- - python=3.12.9
27
- - readline=8.2
28
- - setuptools=75.8.0
29
- - sqlite=3.46.0
30
- - tk=8.6.14
31
- - tzdata=2025a
32
- - wheel=0.45.1
33
- - xz=5.6.4
34
- - xz-gpl-tools=5.6.4
35
- - xz-tools=5.6.4
36
- - zlib=1.2.13
37
  - pip:
38
- - aiohappyeyeballs==2.4.6
39
- - aiohttp==3.11.12
40
- - aiosignal==1.3.2
41
- - annotated-types==0.7.0
42
- - anthropic==0.45.2
43
- - anyio==4.8.0
44
- - attrs==25.1.0
45
- - certifi==2025.1.31
46
- - charset-normalizer==3.4.1
47
- - click==8.1.8
48
- - dataclasses-json==0.6.7
49
- - defusedxml==0.7.1
50
- - distro==1.9.0
51
- - faiss-cpu==1.10.0
52
- - frozenlist==1.5.0
53
- - gitingest==0.1.2
54
- - greenlet==3.1.1
55
- - h11==0.14.0
56
- - httpcore==1.0.7
57
- - httpx==0.28.1
58
- - httpx-sse==0.4.0
59
- - idna==3.10
60
- - jiter==0.8.2
61
- - jsonpatch==1.33
62
- - jsonpointer==3.0.0
63
- - langchain==0.3.18
64
- - langchain-anthropic==0.2.4
65
- - langchain-community==0.3.17
66
- - langchain-core==0.3.34
67
- - langchain-experimental==0.3.4
68
- - langchain-openai==0.2.14
69
- - langchain-text-splitters==0.3.6
70
- - langchain-ollama==0.1.1
71
- - langgraph==0.2.71
72
- - langgraph-checkpoint==2.0.12
73
- - langgraph-sdk==0.1.51
74
- - langserve==0.3.1
75
- - langsmith==0.3.8
76
- - marshmallow==3.26.1
77
- - msgpack==1.1.0
78
- - multidict==6.1.0
79
- - mypy-extensions==1.0.0
80
- - numpy==2.2.2
81
- - openai==1.61.1
82
- - orjson==3.10.15
83
- - packaging==24.2
84
- - propcache==0.2.1
85
- - pydantic==2.10.6
86
- - pydantic-core==2.27.2
87
- - pydantic-settings==2.7.1
88
- - python-dotenv==1.0.1
89
- - pyyaml==6.0.2
90
- - regex==2024.11.6
91
- - requests==2.32.3
92
- - requests-toolbelt==1.0.0
93
- - sniffio==1.3.1
94
- - sqlalchemy==2.0.38
95
- - tenacity==9.0.0
96
- - tiktoken==0.8.0
97
- - tqdm==4.67.1
98
- - typing-extensions==4.12.2
99
- - typing-inspect==0.9.0
100
- - urllib3==2.3.0
101
- - yarl==1.18.3
102
- - zstandard==0.23.0
103
- - boto3==1.36.26
104
- - langchain_aws==0.2.13
 
3
  - conda-forge
4
  - defaults
5
  dependencies:
6
+ - python=3.11
7
+ - pip
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
8
  - pip:
9
+ # Core dependencies
10
+ - fastapi
11
+ - uvicorn[standard]
12
+ - fastmcp
13
+ - pydantic
14
+ - python-dotenv
15
+
16
+ # Foam-Agent core
17
+ - faiss-cpu
18
+ - pyyaml
19
+ - requests
20
+ - numpy
21
+
22
+ # LangChain ecosystem (without version constraints)
23
+ - langchain
24
+ - langchain-core
25
+ - langchain-openai
26
+ - langchain-community
27
+ - langchain-aws
28
+ - langchain-anthropic
29
+ - langchain-ollama
30
+ - langchain-text-splitters
31
+ - langchain-experimental
32
+ - langgraph
33
+ - langgraph-checkpoint
34
+ - langgraph-sdk
35
+ - langserve
36
+ - langsmith
37
+
38
+ # LLM providers
39
+ - openai
40
+ - anthropic
41
+
42
+ # AWS
43
+ - boto3
44
+ - botocore
45
+
46
+ # HTTP and networking
47
+ - httpx
48
+ - httpcore
49
+ - aiohttp
50
+ - aiohappyeyeballs
51
+ - aiosignal
52
+
53
+ # Data processing
54
+ - pandas
55
+ - scikit-learn
56
+ - matplotlib
57
+ - seaborn
58
+
59
+ # Utilities
60
+ - click
61
+ - tqdm
62
+ - tenacity
63
+ - tiktoken
64
+ - orjson
65
+ - msgpack
66
+ - zstandard
67
+
68
+ # Additional dependencies
69
+ - sqlalchemy
70
+ - marshmallow
71
+ - gitingest