From 2ea227f3c08f8628dbe6eb3a55cb9647b2acbd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=90=E7=B2=92=20Yanli?= <mail@yanli.one>
Date: Wed, 29 Apr 2026 20:01:03 +0800
Subject: [PATCH] move the collections folder structure

---
 dify-agent/src/agenton_collections/__init__.py                | 4 ++--
 .../src/agenton_collections/{ => layers}/plain/__init__.py    | 4 ++--
 .../src/agenton_collections/{ => layers}/plain/basic.py       | 0
 .../agenton_collections/{ => layers}/plain/dynamic_tools.py   | 2 +-
 .../agenton_collections/{ => layers}/pydantic_ai/__init__.py  | 2 +-
 .../agenton_collections/{ => layers}/pydantic_ai/bridge.py    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename dify-agent/src/agenton_collections/{ => layers}/plain/__init__.py (64%)
 rename dify-agent/src/agenton_collections/{ => layers}/plain/basic.py (100%)
 rename dify-agent/src/agenton_collections/{ => layers}/plain/dynamic_tools.py (99%)
 rename dify-agent/src/agenton_collections/{ => layers}/pydantic_ai/__init__.py (80%)
 rename dify-agent/src/agenton_collections/{ => layers}/pydantic_ai/bridge.py (97%)

diff --git a/dify-agent/src/agenton_collections/__init__.py b/dify-agent/src/agenton_collections/__init__.py
index cc1365ae6e..3bd8775f64 100644
--- a/dify-agent/src/agenton_collections/__init__.py
+++ b/dify-agent/src/agenton_collections/__init__.py
@@ -14,12 +14,12 @@ from agenton.layers.types import (
     PydanticAIPrompt,
     PydanticAITool,
 )
-from agenton_collections.pydantic_ai import (
+from agenton_collections.layers.pydantic_ai import (
     PydanticAIBridgeLayer,
     PydanticAIBridgeLayerDeps,
     PydanticAIPrompts,
 )
-from agenton_collections.plain import (
+from agenton_collections.layers.plain import (
     DynamicToolsLayer,
     DynamicToolsLayerDeps,
     ObjectLayer,
diff --git a/dify-agent/src/agenton_collections/plain/__init__.py b/dify-agent/src/agenton_collections/layers/plain/__init__.py
similarity index 64%
rename from dify-agent/src/agenton_collections/plain/__init__.py
rename to dify-agent/src/agenton_collections/layers/plain/__init__.py
index 6ff721fe12..76c8da5339 100644
--- a/dify-agent/src/agenton_collections/plain/__init__.py
+++ b/dify-agent/src/agenton_collections/layers/plain/__init__.py
@@ -1,7 +1,7 @@
 """Reusable collection layers for the plain layer family."""
 
-from agenton_collections.plain.basic import ObjectLayer, PromptLayer, ToolsLayer
-from agenton_collections.plain.dynamic_tools import (
+from agenton_collections.layers.plain.basic import ObjectLayer, PromptLayer, ToolsLayer
+from agenton_collections.layers.plain.dynamic_tools import (
     DynamicToolsLayer,
     DynamicToolsLayerDeps,
     with_object,
diff --git a/dify-agent/src/agenton_collections/plain/basic.py b/dify-agent/src/agenton_collections/layers/plain/basic.py
similarity index 100%
rename from dify-agent/src/agenton_collections/plain/basic.py
rename to dify-agent/src/agenton_collections/layers/plain/basic.py
diff --git a/dify-agent/src/agenton_collections/plain/dynamic_tools.py b/dify-agent/src/agenton_collections/layers/plain/dynamic_tools.py
similarity index 99%
rename from dify-agent/src/agenton_collections/plain/dynamic_tools.py
rename to dify-agent/src/agenton_collections/layers/plain/dynamic_tools.py
index 4627f64132..8e03433a5a 100644
--- a/dify-agent/src/agenton_collections/plain/dynamic_tools.py
+++ b/dify-agent/src/agenton_collections/layers/plain/dynamic_tools.py
@@ -23,7 +23,7 @@ from typing import (
 
 from agenton.layers.base import LayerDeps
 from agenton.layers.types import PlainLayer
-from agenton_collections.plain.basic import ObjectLayer
+from agenton_collections.layers.plain.basic import ObjectLayer
 
 type _ObjectToolCallable[ObjectT] = Callable[Concatenate[ObjectT, ...], Any]
 
diff --git a/dify-agent/src/agenton_collections/pydantic_ai/__init__.py b/dify-agent/src/agenton_collections/layers/pydantic_ai/__init__.py
similarity index 80%
rename from dify-agent/src/agenton_collections/pydantic_ai/__init__.py
rename to dify-agent/src/agenton_collections/layers/pydantic_ai/__init__.py
index 7dd799d0dd..7399966d18 100644
--- a/dify-agent/src/agenton_collections/pydantic_ai/__init__.py
+++ b/dify-agent/src/agenton_collections/layers/pydantic_ai/__init__.py
@@ -1,6 +1,6 @@
 """Reusable collection layers for the pydantic-ai layer family."""
 
-from agenton_collections.pydantic_ai.bridge import (
+from agenton_collections.layers.pydantic_ai.bridge import (
     PydanticAIBridgeLayer,
     PydanticAIBridgeLayerDeps,
     PydanticAIPrompts,
diff --git a/dify-agent/src/agenton_collections/pydantic_ai/bridge.py b/dify-agent/src/agenton_collections/layers/pydantic_ai/bridge.py
similarity index 97%
rename from dify-agent/src/agenton_collections/pydantic_ai/bridge.py
rename to dify-agent/src/agenton_collections/layers/pydantic_ai/bridge.py
index 67de0a2edd..2f8573a60e 100644
--- a/dify-agent/src/agenton_collections/pydantic_ai/bridge.py
+++ b/dify-agent/src/agenton_collections/layers/pydantic_ai/bridge.py
@@ -13,7 +13,7 @@ from typing_extensions import override
 
 from agenton.layers.base import LayerDeps
 from agenton.layers.types import PydanticAILayer, PydanticAIPrompt, PydanticAITool
-from agenton_collections.plain.basic import ObjectLayer
+from agenton_collections.layers.plain.basic import ObjectLayer
 
 type PydanticAIPrompts[ObjectT] = PydanticAIPrompt[ObjectT] | Sequence[PydanticAIPrompt[ObjectT]]