Move python code to subdir (microsoft#98)

peteryxu · Jun 20, 2024 · d365a58 · d365a58
1 parent c9e09e2
commit d365a58
Show file tree

Hide file tree

Showing 102 changed files with 57 additions and 51 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -16,6 +16,7 @@ jobs:
     - name: Install Hatch
       uses: pypa/hatch@install
     - run: hatch run ruff format --check
+      working-directory: ./python
 
   lint:
     runs-on: ubuntu-latest
@@ -24,6 +25,7 @@ jobs:
     - name: Install Hatch
       uses: pypa/hatch@install
     - run: hatch run ruff check
+      working-directory: ./python
 
   mypy:
     runs-on: ubuntu-latest
@@ -32,6 +34,7 @@ jobs:
       - name: Install Hatch
         uses: pypa/hatch@install
       - run: hatch run mypy
+        working-directory: ./python
 
   pyright:
     runs-on: ubuntu-latest
@@ -40,6 +43,7 @@ jobs:
       - name: Install Hatch
         uses: pypa/hatch@install
       - run: hatch run pyright
+        working-directory: ./python
 
   test:
     runs-on: ubuntu-latest
@@ -51,6 +55,7 @@ jobs:
       - name: Install Hatch
         uses: pypa/hatch@install
       - run: hatch run +python=${{ matrix.python-version }} test-matrix:pytest -n auto
+        working-directory: ./python
 
   docs:
     runs-on: ubuntu-latest
@@ -59,3 +64,4 @@ jobs:
       - name: Install Hatch
         uses: pypa/hatch@install
       - run: hatch run docs:check
+        working-directory: ./python
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -33,10 +33,11 @@ jobs:
       - name: Install Hatch
         uses: pypa/hatch@install
       - run: hatch run docs:build
+        working-directory: ./python
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: 'docs/build'
+          path: 'python/docs/build'
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/README.md b/README.md
@@ -1,45 +1,6 @@
-# AutoGenNext
+# AGNext
 
-- [Documentation](http://microsoft.github.io/agnext)
-- [Examples](https://github.com/microsoft/agnext/tree/main/examples)
+See corresponding subdirectories for more information.
 
-
-## Package layering
-
-- `core` are the the foundational generic interfaces upon which all else is built. This module must not depend on any other module.
-- `components` are the building blocks for creating single agents
-- `application` are implementations of core components that are used to compose an application
-- `chat` is the concrete implementation of multi-agent interactions. Most users will deal with this module.
-
-
-## Development
-
-**TL;DR**, run all checks with:
-
-```sh
-hatch run check
-```
-
-### Setup
-
-- [Install `hatch`](https://hatch.pypa.io/1.12/install/).
-
-### Virtual environment
-
-To get a shell with the package available (virtual environment) run:
-```sh
-hatch shell
-```
-
-### Common tasks
-
-- Format: `hatch run check`
-- Lint: `hatch run lint`
-- Test: `hatch run pytest -n auto`
-- Mypy: `hatch run mypy`
-- Pyright: `hatch run pyright`
-- Build docs: `hatch run docs:build`
-- Auto rebuild+serve docs: `hatch run docs:serve`
-
-> [!NOTE]
-> These don't need to be run in a virtual environment, `hatch` will automatically manage it for you.
+- [Python Documentation](http://microsoft.github.io/agnext)
+- [Python Examples](https://github.com/microsoft/agnext/tree/main/python/examples)
diff --git a/.gitignore → python/.gitignore b/.gitignore → python/.gitignore
diff --git a/python/README.md b/python/README.md
@@ -0,0 +1,45 @@
+# AGNext
+
+- [Documentation](http://microsoft.github.io/agnext)
+- [Examples](https://github.com/microsoft/agnext/tree/main/python/examples)
+
+
+## Package layering
+
+- `core` are the the foundational generic interfaces upon which all else is built. This module must not depend on any other module.
+- `components` are the building blocks for creating single agents
+- `application` are implementations of core components that are used to compose an application
+- `chat` is the concrete implementation of multi-agent interactions. Most users will deal with this module.
+
+
+## Development
+
+**TL;DR**, run all checks with:
+
+```sh
+hatch run check
+```
+
+### Setup
+
+- [Install `hatch`](https://hatch.pypa.io/1.12/install/).
+
+### Virtual environment
+
+To get a shell with the package available (virtual environment) run:
+```sh
+hatch shell
+```
+
+### Common tasks
+
+- Format: `hatch run check`
+- Lint: `hatch run lint`
+- Test: `hatch run pytest -n auto`
+- Mypy: `hatch run mypy`
+- Pyright: `hatch run pyright`
+- Build docs: `hatch run docs:build`
+- Auto rebuild+serve docs: `hatch run docs:serve`
+
+> [!NOTE]
+> These don't need to be run in a virtual environment, `hatch` will automatically manage it for you.
diff --git a/docs/src/_apidoc_templates/module.rst_t → ...n/docs/src/_apidoc_templates/module.rst_t b/docs/src/_apidoc_templates/module.rst_t → ...n/docs/src/_apidoc_templates/module.rst_t
diff --git a/docs/src/_apidoc_templates/package.rst_t → .../docs/src/_apidoc_templates/package.rst_t b/docs/src/_apidoc_templates/package.rst_t → .../docs/src/_apidoc_templates/package.rst_t
diff --git a/docs/src/conf.py → python/docs/src/conf.py b/docs/src/conf.py → python/docs/src/conf.py
diff --git a/docs/src/contributing.md → python/docs/src/contributing.md b/docs/src/contributing.md → python/docs/src/contributing.md
diff --git a/docs/src/core-concepts/agent.md → python/docs/src/core-concepts/agent.md b/docs/src/core-concepts/agent.md → python/docs/src/core-concepts/agent.md
diff --git a/docs/src/core-concepts/cancellation.md → ...on/docs/src/core-concepts/cancellation.md b/docs/src/core-concepts/cancellation.md → ...on/docs/src/core-concepts/cancellation.md
diff --git a/docs/src/core-concepts/logging.md → python/docs/src/core-concepts/logging.md b/docs/src/core-concepts/logging.md → python/docs/src/core-concepts/logging.md
diff --git a/docs/src/core-concepts/memory.md → python/docs/src/core-concepts/memory.md b/docs/src/core-concepts/memory.md → python/docs/src/core-concepts/memory.md
diff --git a/docs/src/core-concepts/namespace.md → python/docs/src/core-concepts/namespace.md b/docs/src/core-concepts/namespace.md → python/docs/src/core-concepts/namespace.md
diff --git a/docs/src/core-concepts/patterns.md → python/docs/src/core-concepts/patterns.md b/docs/src/core-concepts/patterns.md → python/docs/src/core-concepts/patterns.md
diff --git a/docs/src/core-concepts/runtime.md → python/docs/src/core-concepts/runtime.md b/docs/src/core-concepts/runtime.md → python/docs/src/core-concepts/runtime.md
diff --git a/docs/src/core-concepts/tools.md → python/docs/src/core-concepts/tools.md b/docs/src/core-concepts/tools.md → python/docs/src/core-concepts/tools.md
diff --git a/docs/src/getting-started/installation.md → .../docs/src/getting-started/installation.md b/docs/src/getting-started/installation.md → .../docs/src/getting-started/installation.md
diff --git a/docs/src/getting-started/tutorial.md → python/docs/src/getting-started/tutorial.md b/docs/src/getting-started/tutorial.md → python/docs/src/getting-started/tutorial.md
diff --git a/.../src/guides/azure-openai-with-aad-auth.md → .../src/guides/azure-openai-with-aad-auth.md b/.../src/guides/azure-openai-with-aad-auth.md → .../src/guides/azure-openai-with-aad-auth.md
diff --git a/docs/src/guides/group-chat-coder-reviewer.md → ...s/src/guides/group-chat-coder-reviewer.md b/docs/src/guides/group-chat-coder-reviewer.md → ...s/src/guides/group-chat-coder-reviewer.md
diff --git a/docs/src/guides/type-routed-agent.md → python/docs/src/guides/type-routed-agent.md b/docs/src/guides/type-routed-agent.md → python/docs/src/guides/type-routed-agent.md
diff --git a/docs/src/index.rst → python/docs/src/index.rst b/docs/src/index.rst → python/docs/src/index.rst
diff --git a/examples/README.md → python/examples/README.md b/examples/README.md → python/examples/README.md
diff --git a/examples/assistant.py → python/examples/assistant.py b/examples/assistant.py → python/examples/assistant.py
diff --git a/examples/chat_room.py → python/examples/chat_room.py b/examples/chat_room.py → python/examples/chat_room.py
diff --git a/examples/chess_game.py → python/examples/chess_game.py b/examples/chess_game.py → python/examples/chess_game.py
diff --git a/examples/coder_reviewer.py → python/examples/coder_reviewer.py b/examples/coder_reviewer.py → python/examples/coder_reviewer.py
diff --git a/examples/illustrator_critics.py → python/examples/illustrator_critics.py b/examples/illustrator_critics.py → python/examples/illustrator_critics.py
diff --git a/examples/inner_outer.py → python/examples/inner_outer.py b/examples/inner_outer.py → python/examples/inner_outer.py
diff --git a/examples/orchestrator.py → python/examples/orchestrator.py b/examples/orchestrator.py → python/examples/orchestrator.py
diff --git a/examples/software_consultancy.py → python/examples/software_consultancy.py b/examples/software_consultancy.py → python/examples/software_consultancy.py
diff --git a/examples/utils.py → python/examples/utils.py b/examples/utils.py → python/examples/utils.py
diff --git a/pyproject.toml → python/pyproject.toml b/pyproject.toml → python/pyproject.toml
diff --git a/src/agnext/__init__.py → python/src/agnext/__init__.py b/src/agnext/__init__.py → python/src/agnext/__init__.py
diff --git a/src/agnext/application/__init__.py → python/src/agnext/application/__init__.py b/src/agnext/application/__init__.py → python/src/agnext/application/__init__.py
diff --git a/...ication/_single_threaded_agent_runtime.py → ...ication/_single_threaded_agent_runtime.py b/...ication/_single_threaded_agent_runtime.py → ...ication/_single_threaded_agent_runtime.py
diff --git a/src/agnext/application/logging/__init__.py → ...rc/agnext/application/logging/__init__.py b/src/agnext/application/logging/__init__.py → ...rc/agnext/application/logging/__init__.py
diff --git a/src/agnext/application/logging/_events.py → ...src/agnext/application/logging/_events.py b/src/agnext/application/logging/_events.py → ...src/agnext/application/logging/_events.py
diff --git a/src/agnext/application/logging/_llm_usage.py → .../agnext/application/logging/_llm_usage.py b/src/agnext/application/logging/_llm_usage.py → .../agnext/application/logging/_llm_usage.py
diff --git a/src/agnext/chat/__init__.py → python/src/agnext/chat/__init__.py b/src/agnext/chat/__init__.py → python/src/agnext/chat/__init__.py
diff --git a/src/agnext/chat/agents/__init__.py → python/src/agnext/chat/agents/__init__.py b/src/agnext/chat/agents/__init__.py → python/src/agnext/chat/agents/__init__.py
diff --git a/...next/chat/agents/chat_completion_agent.py → ...next/chat/agents/chat_completion_agent.py b/...next/chat/agents/chat_completion_agent.py → ...next/chat/agents/chat_completion_agent.py
diff --git a/...ext/chat/agents/image_generation_agent.py → ...ext/chat/agents/image_generation_agent.py b/...ext/chat/agents/image_generation_agent.py → ...ext/chat/agents/image_generation_agent.py
diff --git a/src/agnext/chat/agents/oai_assistant.py → ...n/src/agnext/chat/agents/oai_assistant.py b/src/agnext/chat/agents/oai_assistant.py → ...n/src/agnext/chat/agents/oai_assistant.py
diff --git a/src/agnext/chat/agents/user_proxy.py → python/src/agnext/chat/agents/user_proxy.py b/src/agnext/chat/agents/user_proxy.py → python/src/agnext/chat/agents/user_proxy.py
diff --git a/src/agnext/chat/memory/__init__.py → python/src/agnext/chat/memory/__init__.py b/src/agnext/chat/memory/__init__.py → python/src/agnext/chat/memory/__init__.py
diff --git a/src/agnext/chat/memory/_base.py → python/src/agnext/chat/memory/_base.py b/src/agnext/chat/memory/_base.py → python/src/agnext/chat/memory/_base.py
diff --git a/src/agnext/chat/memory/_buffered.py → python/src/agnext/chat/memory/_buffered.py b/src/agnext/chat/memory/_buffered.py → python/src/agnext/chat/memory/_buffered.py
diff --git a/src/agnext/chat/memory/_head_and_tail.py → .../src/agnext/chat/memory/_head_and_tail.py b/src/agnext/chat/memory/_head_and_tail.py → .../src/agnext/chat/memory/_head_and_tail.py
diff --git a/src/agnext/chat/patterns/__init__.py → python/src/agnext/chat/patterns/__init__.py b/src/agnext/chat/patterns/__init__.py → python/src/agnext/chat/patterns/__init__.py
diff --git a/...gnext/chat/patterns/group_chat_manager.py → ...gnext/chat/patterns/group_chat_manager.py b/...gnext/chat/patterns/group_chat_manager.py → ...gnext/chat/patterns/group_chat_manager.py
diff --git a/src/agnext/chat/patterns/group_chat_utils.py → .../agnext/chat/patterns/group_chat_utils.py b/src/agnext/chat/patterns/group_chat_utils.py → .../agnext/chat/patterns/group_chat_utils.py
diff --git a/...agnext/chat/patterns/orchestrator_chat.py → ...agnext/chat/patterns/orchestrator_chat.py b/...agnext/chat/patterns/orchestrator_chat.py → ...agnext/chat/patterns/orchestrator_chat.py
diff --git a/src/agnext/chat/types.py → python/src/agnext/chat/types.py b/src/agnext/chat/types.py → python/src/agnext/chat/types.py
diff --git a/src/agnext/chat/utils.py → python/src/agnext/chat/utils.py b/src/agnext/chat/utils.py → python/src/agnext/chat/utils.py
diff --git a/src/agnext/components/__init__.py → python/src/agnext/components/__init__.py b/src/agnext/components/__init__.py → python/src/agnext/components/__init__.py
diff --git a/src/agnext/components/_function_utils.py → .../src/agnext/components/_function_utils.py b/src/agnext/components/_function_utils.py → .../src/agnext/components/_function_utils.py
diff --git a/src/agnext/components/_image.py → python/src/agnext/components/_image.py b/src/agnext/components/_image.py → python/src/agnext/components/_image.py
diff --git a/src/agnext/components/_pydantic_compat.py → ...src/agnext/components/_pydantic_compat.py b/src/agnext/components/_pydantic_compat.py → ...src/agnext/components/_pydantic_compat.py
diff --git a/src/agnext/components/_type_routed_agent.py → ...c/agnext/components/_type_routed_agent.py b/src/agnext/components/_type_routed_agent.py → ...c/agnext/components/_type_routed_agent.py
diff --git a/src/agnext/components/_types.py → python/src/agnext/components/_types.py b/src/agnext/components/_types.py → python/src/agnext/components/_types.py
diff --git a/...next/components/code_executor/__init__.py → ...next/components/code_executor/__init__.py b/...next/components/code_executor/__init__.py → ...next/components/code_executor/__init__.py
diff --git a/src/agnext/components/code_executor/_base.py → .../agnext/components/code_executor/_base.py b/src/agnext/components/code_executor/_base.py → .../agnext/components/code_executor/_base.py
diff --git a/...mponents/code_executor/_func_with_reqs.py → ...mponents/code_executor/_func_with_reqs.py b/...mponents/code_executor/_func_with_reqs.py → ...mponents/code_executor/_func_with_reqs.py
diff --git a/...omponents/code_executor/_impl/__init__.py → ...omponents/code_executor/_impl/__init__.py b/...omponents/code_executor/_impl/__init__.py → ...omponents/code_executor/_impl/__init__.py
diff --git a/...xecutor/_impl/command_line_code_result.py → ...xecutor/_impl/command_line_code_result.py b/...xecutor/_impl/command_line_code_result.py → ...xecutor/_impl/command_line_code_result.py
diff --git a/.../_impl/local_commandline_code_executor.py → .../_impl/local_commandline_code_executor.py b/.../_impl/local_commandline_code_executor.py → .../_impl/local_commandline_code_executor.py
diff --git a/...t/components/code_executor/_impl/utils.py → ...t/components/code_executor/_impl/utils.py b/...t/components/code_executor/_impl/utils.py → ...t/components/code_executor/_impl/utils.py
diff --git a/src/agnext/components/models/__init__.py → .../src/agnext/components/models/__init__.py b/src/agnext/components/models/__init__.py → .../src/agnext/components/models/__init__.py
diff --git a/...agnext/components/models/_model_client.py → ...agnext/components/models/_model_client.py b/...agnext/components/models/_model_client.py → ...agnext/components/models/_model_client.py
diff --git a/src/agnext/components/models/_model_info.py → ...c/agnext/components/models/_model_info.py b/src/agnext/components/models/_model_info.py → ...c/agnext/components/models/_model_info.py
diff --git a/...gnext/components/models/_openai_client.py → ...gnext/components/models/_openai_client.py b/...gnext/components/models/_openai_client.py → ...gnext/components/models/_openai_client.py
diff --git a/src/agnext/components/models/_types.py → ...on/src/agnext/components/models/_types.py b/src/agnext/components/models/_types.py → ...on/src/agnext/components/models/_types.py
diff --git a/...next/components/models/config/__init__.py → ...next/components/models/config/__init__.py b/...next/components/models/config/__init__.py → ...next/components/models/config/__init__.py
diff --git a/src/agnext/components/tools/__init__.py → ...n/src/agnext/components/tools/__init__.py b/src/agnext/components/tools/__init__.py → ...n/src/agnext/components/tools/__init__.py
diff --git a/src/agnext/components/tools/_base.py → python/src/agnext/components/tools/_base.py b/src/agnext/components/tools/_base.py → python/src/agnext/components/tools/_base.py
diff --git a/...gnext/components/tools/_code_execution.py → ...gnext/components/tools/_code_execution.py b/...gnext/components/tools/_code_execution.py → ...gnext/components/tools/_code_execution.py
diff --git a/...agnext/components/tools/_function_tool.py → ...agnext/components/tools/_function_tool.py b/...agnext/components/tools/_function_tool.py → ...agnext/components/tools/_function_tool.py
diff --git a/src/agnext/core/__init__.py → python/src/agnext/core/__init__.py b/src/agnext/core/__init__.py → python/src/agnext/core/__init__.py
diff --git a/src/agnext/core/_agent.py → python/src/agnext/core/_agent.py b/src/agnext/core/_agent.py → python/src/agnext/core/_agent.py
diff --git a/src/agnext/core/_agent_id.py → python/src/agnext/core/_agent_id.py b/src/agnext/core/_agent_id.py → python/src/agnext/core/_agent_id.py
diff --git a/src/agnext/core/_agent_metadata.py → python/src/agnext/core/_agent_metadata.py b/src/agnext/core/_agent_metadata.py → python/src/agnext/core/_agent_metadata.py
diff --git a/src/agnext/core/_agent_props.py → python/src/agnext/core/_agent_props.py b/src/agnext/core/_agent_props.py → python/src/agnext/core/_agent_props.py
diff --git a/src/agnext/core/_agent_proxy.py → python/src/agnext/core/_agent_proxy.py b/src/agnext/core/_agent_proxy.py → python/src/agnext/core/_agent_proxy.py
diff --git a/src/agnext/core/_agent_runtime.py → python/src/agnext/core/_agent_runtime.py b/src/agnext/core/_agent_runtime.py → python/src/agnext/core/_agent_runtime.py
diff --git a/src/agnext/core/_base_agent.py → python/src/agnext/core/_base_agent.py b/src/agnext/core/_base_agent.py → python/src/agnext/core/_base_agent.py
diff --git a/src/agnext/core/_cancellation_token.py → ...on/src/agnext/core/_cancellation_token.py b/src/agnext/core/_cancellation_token.py → ...on/src/agnext/core/_cancellation_token.py
diff --git a/src/agnext/core/exceptions.py → python/src/agnext/core/exceptions.py b/src/agnext/core/exceptions.py → python/src/agnext/core/exceptions.py
diff --git a/src/agnext/core/intervention.py → python/src/agnext/core/intervention.py b/src/agnext/core/intervention.py → python/src/agnext/core/intervention.py
diff --git a/src/agnext/py.typed → python/src/agnext/py.typed b/src/agnext/py.typed → python/src/agnext/py.typed
diff --git a/...ecution/test_commandline_code_executor.py → ...ecution/test_commandline_code_executor.py b/...ecution/test_commandline_code_executor.py → ...ecution/test_commandline_code_executor.py
diff --git a/.../execution/test_user_defined_functions.py → .../execution/test_user_defined_functions.py b/.../execution/test_user_defined_functions.py → .../execution/test_user_defined_functions.py
diff --git a/tests/test_cancellation.py → python/tests/test_cancellation.py b/tests/test_cancellation.py → python/tests/test_cancellation.py
diff --git a/tests/test_intervention.py → python/tests/test_intervention.py b/tests/test_intervention.py → python/tests/test_intervention.py
diff --git a/tests/test_llm_usage.py → python/tests/test_llm_usage.py b/tests/test_llm_usage.py → python/tests/test_llm_usage.py
diff --git a/tests/test_runtime.py → python/tests/test_runtime.py b/tests/test_runtime.py → python/tests/test_runtime.py
diff --git a/tests/test_state.py → python/tests/test_state.py b/tests/test_state.py → python/tests/test_state.py
diff --git a/tests/test_tools.py → python/tests/test_tools.py b/tests/test_tools.py → python/tests/test_tools.py
diff --git a/tests/test_types.py → python/tests/test_types.py b/tests/test_types.py → python/tests/test_types.py
diff --git a/tests/test_utils/__init__.py → python/tests/test_utils/__init__.py b/tests/test_utils/__init__.py → python/tests/test_utils/__init__.py