Skip to content

Commit cf62096

Browse files
committed
Merge remote-tracking branch 'origin/master' into imap-mail-toolkit
2 parents cbd3514 + d449281 commit cf62096

File tree

1,339 files changed

+62372
-14337
lines changed

Some content is hidden

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

1,339 files changed

+62372
-14337
lines changed

.container/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ GOOGLE_API_KEY=123456789
1515
SEARCH_ENGINE_ID=123456789
1616

1717
# For OpenWeatherMap API
18-
OPENWEATHERMAP_API_KEY=123456789
18+
OPENWEATHERMAP_API_KEY=123456789

.container/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10-bookworm
1+
FROM python:3.14-bookworm@sha256:14ab73bd56794689c00cce8162da1eb71925b188299f35f81717ec23816a5dea
22

33
RUN pip install uv
44
RUN groupadd -r appuser && useradd -r -g appuser appuser

.container/README.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ develop on it, with Docker.
1111

1212
## Configure Environment
1313
Before starting the container, you need to navigate into the
14-
[.container](../.container) folder and create a `.env` file **with your own
15-
API
16-
keys**, so that these keys will be present in the environment variables of
17-
the container, which will later be used by CAMEL. The list of API keys that
14+
[.container](../.container) folder and create a `.env` file **with your own
15+
API
16+
keys**, so that these keys will be present in the environment variables of
17+
the container, which will later be used by CAMEL. The list of API keys that
1818
can be found in the `.env.example` file.
1919

2020
```bash
@@ -25,15 +25,15 @@ cp .env.example .env
2525
```
2626

2727
## Start Container
28-
After configuring the API keys, simply run the following command to start
28+
After configuring the API keys, simply run the following command to start
2929
up the working container. This will automatically set up the environment and
3030
dependencies for CAMEL. It may take some time, please be patient.
3131

3232
```bash
3333
docker compose up -d
3434
```
3535

36-
After the build is completed, you can see the image `camel:localdev` in the
36+
After the build is completed, you can see the image `camel:localdev` in the
3737
list of images, along with a started container, `camel-localdev`.
3838

3939
```bash
@@ -54,7 +54,7 @@ docker compose exec camel bash
5454
Then you will be in the container environment under the CAMEL directory, with
5555
all the dependencies installed.
5656

57-
Then You can try running the
57+
Then You can try running the
5858
[role_playing.py](../examples/ai_society/role_playing.py)
5959
example.
6060

@@ -66,43 +66,43 @@ If you see the agents interacting with each other, this means you are all set.
6666
Have fun with CAMEL in Docker!
6767

6868
## Save Your Progress
69-
We support volume mounting in the started container, which means that all
70-
of your changes in the CAMEL directory inside the container will be synced
69+
We support volume mounting in the started container, which means that all
70+
of your changes in the CAMEL directory inside the container will be synced
7171
into the CAMEL repo on your host system. Therefore, you don't need to worry
7272
about losing your progress when you exit the container.
7373

7474
## Exit, Stop and Delete the Container
7575
You can simply press `Ctrl + D` or use the `exit` command to exit the
7676
container.
7777

78-
After exiting the container, under normal cases the container will still be
79-
running in the background. If you don't need the container anymore, you can
78+
After exiting the container, under normal cases the container will still be
79+
running in the background. If you don't need the container anymore, you can
8080
stop and delete the container with the following command.
8181

8282
```bash
8383
docker compose down
8484
```
8585

8686
## Online Images
87-
For users who only want to have a quick tryout on CAMEL, we also provide the
87+
For users who only want to have a quick tryout on CAMEL, we also provide the
8888
pre-built images on
8989
[our GitHub Container Registry](https://github.com/camel-ai/camel/pkgs/container/camel).
90-
Considering the size of the image, we only offer the image with the basic
90+
Considering the size of the image, we only offer the image with the basic
9191
dependencies.
9292

93-
Note that there are some key differences between the local development
93+
Note that there are some key differences between the local development
9494
image and the pre-built image that you should be aware of.
95-
1. The pre-built image is built upon the source code of each release of CAMEL.
96-
This means that they are not suitable for development, as they don't
97-
contain the git support. If you want to develop on CAMEL, please build
95+
1. The pre-built image is built upon the source code of each release of CAMEL.
96+
This means that they are not suitable for development, as they don't
97+
contain the git support. If you want to develop on CAMEL, please build
9898
the image by yourself according to the instructions above.
99-
2. The pre-built image only contains the basic dependencies for running the
100-
examples. If you want to run the examples that require additional
101-
dependencies, you need to install them according to the
99+
2. The pre-built image only contains the basic dependencies for running the
100+
examples. If you want to run the examples that require additional
101+
dependencies, you need to install them according to the
102102
installation guide in CAMEL's [README](../README.md).
103-
3. The pre-built image doesn't contain the API keys. You need to set up the
103+
3. The pre-built image doesn't contain the API keys. You need to set up the
104104
API keys by yourself in the container environment.
105-
4. The pre-built image does not support volume mounting. This means that all
105+
4. The pre-built image does not support volume mounting. This means that all
106106
of your changes in the container will be lost when you delete the container.
107107

108108
To quickly start a container with the pre-built image, you can use the
@@ -123,4 +123,4 @@ command.
123123

124124
```bash
125125
python examples/ai_society/role_playing.py
126-
```
126+
```

.container/docker-compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ services:
1111
- .env
1212
user: "${UID:-1000}:${GID:-1000}"
1313
command: ["tail", "-f", "/dev/null"]
14-
15-

.container/minimal_build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10-bookworm
1+
FROM python:3.14-bookworm@sha256:14ab73bd56794689c00cce8162da1eb71925b188299f35f81717ec23816a5dea
22

33
RUN pip install uv
44
RUN groupadd -r appuser && useradd -r -g appuser appuser

.env.example

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# Models API
1111
#===========================================
1212

13+
# Cerebras API (https://chat.cerebras.ai/)
14+
# CEREBRAS_API_KEY="Fill your API key here"
15+
1316
# OpenAI API (https://platform.openai.com/signup)
1417
# OPENAI_API_KEY="Fill your API key here"
1518

@@ -70,6 +73,10 @@
7073
# GOOGLE_API_KEY="Fill your API key here"
7174
# SEARCH_ENGINE_ID="Fill your API key here"
7275

76+
# Google Gmail API (https://console.cloud.google.com/)
77+
# GOOGLE_CLIENT_ID="Fill your API key here"
78+
# GOOGLE_CLIENT_SECRET="Fill your API key here"
79+
7380
# OpenWeatherMap API (https://home.openweathermap.org/users/sign_up)
7481
# OPENWEATHERMAP_API_KEY="Fill your API key here"
7582

@@ -133,4 +140,4 @@
133140

134141
# Grok API key
135142
# XAI_API_KEY="Fill your Grok API Key here"
136-
# XAI_API_BASE_URL="Fill your Grok API Base URL here"
143+
# XAI_API_BASE_URL="Fill your Grok API Base URL here"

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 🐛 Bug Report
22
description: File an issue about a bug.
33
title: "[BUG] "
4-
labels: [bug]
4+
labels: [bug, Needs Triage]
55
body:
66
- type: markdown
77
attributes:
@@ -26,7 +26,7 @@ body:
2626
attributes:
2727
label: What version of camel are you using?
2828
description: Run command `python3 -c 'print(__import__("camel").__version__)'` in your shell and paste the output here.
29-
placeholder: E.g., 0.2.76a10
29+
placeholder: E.g., 0.2.82
3030
validations:
3131
required: true
3232

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: ✨ Feature Request
22
description: Suggest an idea for this project.
33
title: "[Feature Request] "
4-
labels: [enhancement]
4+
labels: [Needs Triage]
55
body:
66
- type: checkboxes
77
id: steps

.github/ISSUE_TEMPLATE/questions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 🤔 Questions / Help / Support
22
description: Do you need support?
33
title: "[Question] "
4-
labels: [question]
4+
labels: [question, Needs Triage]
55
body:
66
- type: checkboxes
77
id: steps

.github/actions/camel_install/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
name: Restore caches for the virtual environment based on uv.lock
2222
with:
2323
path: ./.venv
24-
key: venv-${{ hashFiles('uv.lock') }}
24+
key: venv-${{ hashFiles('uv.lock', 'pyproject.toml') }}
2525
- name: Validate cached virtual environment
2626
id: validate-venv
2727
if: steps.cache-restore.outputs.cache-hit == 'true'
@@ -49,4 +49,4 @@ runs:
4949
if: steps.cache-restore.outputs.cache-hit != 'true' || steps.validate-venv.outputs.cache-valid == 'false'
5050
with:
5151
path: ./.venv
52-
key: venv-${{ hashFiles('uv.lock') }}
52+
key: venv-${{ hashFiles('uv.lock', 'pyproject.toml') }}

0 commit comments

Comments
 (0)