diff --git a/Readme.md b/Readme.md index 1cc48b6..1e9da54 100644 --- a/Readme.md +++ b/Readme.md @@ -5,18 +5,17 @@ This is a simple example of an calculator "agent system" using the [Agents Platf Start by `docker compose up` and open web interface of management at . ## Calculator +A riddle is a math expression, e.g., `x * y =`. +The values of the variables `x` and `y` are defined via text files, e.g., a line `x = 10` in text file assigns the value to `12` to the variable `x`. -A riddle is a math expression, e.g., `x * y =` and the values of the variables `x` and `y` are defined via text files. -For example a line `x = 12` in text file assigns the value to `12` to the variable `x`. - -For example, the result of a riddle `x * x =` would be `144` with the explanation `12 * 12 = 144`. +For example, the result of a riddle `x * x =` would be `100` with the explanation `10 * 10 = 100`. ## Riddle Example -In this example the values of the variables are [`x = 10`](./data/share/example/x.txt), [`y = 15`](./data/share/example/y.txt), [`z = 20`](./data/share/example/z.txt), see the files in [`./data/share/example/`](./data/share/example/). +In this example the values of the variables are [`x = 10`](./data/share/example/x.txt), [`y = 15`](./data/share/example/y.txt), and [`z = 20`](./data/share/example/z.txt); see the files in [`./data/share/example/`](./data/share/example/). -1. You may send a riddle to the management using the web interface () and press "Send Message" +1. You can send a riddle to management via the web interface (http://localhost:8080/app/new) by filling out the form and clicking "Send Message.": ![](./webinterface_new_riddle.png) -2. The message to the management will look like: +2. The message to management will look like this: ```json { "id": "test1", @@ -58,6 +57,6 @@ In this example the values of the variables are [`x = 10`](./data/share/example/ "contacts": 0 } ``` -3. Message will be send between agents for solving the riddle. -4. Result can be found in web interface () +3. Afterwards, messages will be sent between agents while they solve the riddle. These messages are viewable in the web interface. (). +4. The result can finally be found in the latest message.: ![](./webinterface_result.png) \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d5de938..228f0e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - ./data/persist-extract/:/ums-agenten/persist/ - ./src/:/ums-agenten/project/src/:ro # for development: will detect file changes and reload server with new source - entrypoint: bash -c "SERVE=true uvicorn ums.agent.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /ums-agenten/project/src/" + #entrypoint: bash -c "SERVE=true uvicorn ums.agent.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /ums-agenten/project/src/" agent_solve: image: git.chai.uni-hamburg.de/ums-agenten/base-agent:cpu-arm64 @@ -47,7 +47,7 @@ services: - ./data/share/:/ums-agenten/share/ - ./data/persist-solve/:/ums-agenten/persist/ - ./src/:/ums-agenten/project/src/:ro - entrypoint: bash -c "SERVE=true uvicorn ums.agent.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /ums-agenten/project/src/" + #entrypoint: bash -c "SERVE=true uvicorn ums.agent.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /ums-agenten/project/src/" agent_gatekeeper: image: git.chai.uni-hamburg.de/ums-agenten/base-agent:cpu-arm64 @@ -61,5 +61,5 @@ services: - ./data/share/:/ums-agenten/share/ - ./data/persist-validate/:/ums-agenten/persist/ - ./src/:/ums-agenten/project/src/:ro - entrypoint: bash -c "SERVE=true uvicorn ums.agent.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /ums-agenten/project/src/" + #entrypoint: bash -c "SERVE=true uvicorn ums.agent.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /ums-agenten/project/src/" \ No newline at end of file diff --git a/src/extract/agent.py b/src/extract/agent.py index 54b23db..67a8986 100644 --- a/src/extract/agent.py +++ b/src/extract/agent.py @@ -8,7 +8,7 @@ import re from ums.agent import ExtractTextAgent -from ums.utils import RiddleData, ExtractedData, ExtractedContent +from ums.utils import RiddleData, ExtractedData class CalculatorExtractVariables(ExtractTextAgent):