fix rebase conflict

Author: wenjin272

python/flink_agents/runtime/resource_cache.py

@@ -21,8 +21,8 @@
 from flink_agents.plan.configuration import AgentConfiguration
 from flink_agents.plan.function import JavaFunction
 from flink_agents.plan.resource_provider import JavaResourceProvider, ResourceProvider
-from flink_agents.runtime.resource_context import ResourceContextImpl
 from flink_agents.plan.tools.function_tool import FunctionTool
+from flink_agents.runtime.resource_context import ResourceContextImpl
 
 
 class ResourceCache:

python/flink_agents/runtime/skill/repository/materialized_skill_repository.py

@@ -47,6 +47,7 @@ class MaterializedSkillRepository(SkillRepository):
     """
 
     def __init__(self, materialization: Materialized) -> None:
+        """Initialize a :class:`MaterializedSkillRepository`."""
         self._materialization = materialization
         self._reader = SkillDirectoryReader(materialization.dir)
 

python/flink_agents/runtime/skill/skill_source_registry.py

@@ -32,7 +32,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Callable, Dict, Mapping
+from typing import TYPE_CHECKING, Callable, Dict, Mapping
 
 from flink_agents.runtime.skill.repository.filesystem_repository import (
     FileSystemSkillRepository,
@@ -41,7 +41,9 @@
     PackageSkillRepository,
 )
 from flink_agents.runtime.skill.repository.url_repository import URLSkillRepository
-from flink_agents.runtime.skill.skill_repository import SkillRepository
+
+if TYPE_CHECKING:
+    from flink_agents.runtime.skill.skill_repository import SkillRepository
 
 
 @dataclass(frozen=True)

runtime/src/main/java/org/apache/flink/agents/runtime/operator/PythonBridgeManager.java

@@ -162,7 +162,10 @@ void open(
                             jobIdentifier);
 
             javaResourceAdapter =
-                    new JavaResourceAdapter(resourceCache.getResourceContext(), pythonInterpreter);
+                    new JavaResourceAdapter(
+                            resourceCache.getResourceContext(),
+                            pythonInterpreter,
+                            userCodeClassLoader);
             if (containPythonResource || mem0Configured) {
                 initPythonResourceAdapter(agentPlan, resourceCache);
             }