opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-04 16:07:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix conflict

Browse Source
This commit is contained in:
fatelei 2026-09-02 09:14:24 +08:00
parent 5fe4ceb651
commit e85339e06e
No known key found for this signature in database
GPG Key ID: 2F91DA05646F4EED
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/console/agent/roster.py
View File

@ -79,8 +79,8 @@ from services.agent.observability_service import (
)
from services.agent.roster_service import AgentRosterService
from services.app_service import AgentAppPublicationCounts, AppListParams, AppService, CreateAppParams
from services.enterprise.enterprise_service import EnterpriseService
from services.enterprise import rbac_service as enterprise_rbac_service
from services.enterprise.enterprise_service import EnterpriseService
from services.entities.agent_entities import ComposerSavePayload, RosterListQuery
from services.system_feature_service import SystemFeatureService
from tasks.initialize_created_app_rbac_access_task import initialize_created_app_rbac_access_task

3
api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py
View File

@ -598,7 +598,6 @@ def test_agent_app_list_and_create_use_agent_route(
"account_id": account_id,
"commit": False,
}
<<<<<<< HEAD
def test_agent_app_create_skips_rbac_access_initialization_when_rbac_is_disabled(
@ -669,8 +668,6 @@ def test_agent_app_create_skips_rbac_access_initialization_when_rbac_is_disabled
assert created["id"] == "agent-created"
replace_whitelist.assert_not_called()
initialize_access.assert_not_called()
=======
>>>>>>> feat/app-access-point-permission
def test_agent_app_create_payload_allows_optional_role() -> None: