fix(py/genkit): fix resource test failures

- Replace MockInput classes with ResourceInput instances in tests
- Use resource() function instead of Action constructor for dynamic providers
- Change provider_fn return type from Action|None to object to avoid Pydantic schema generation errors
- Remove unused Action import

All 729 tests now pass.

Author: yesudeep

py/packages/genkit/tests/genkit/ai/resource_integration_test.py

@@ -23,7 +23,7 @@
 
 from genkit.blocks.generate import generate_action
 from genkit.blocks.resource import ResourceInput, ResourceOutput, define_resource
-from genkit.core.action import Action, ActionRunContext
+from genkit.core.action import ActionRunContext
 from genkit.core.registry import ActionKind, Registry
 from genkit.core.typing import (
     GenerateActionOptions,
@@ -79,15 +79,17 @@ async def test_dynamic_action_provider_resource() -> None:
     registry = Registry()
 
     # Register a dynamic provider that handles any "dynamic://*" uri
-    def provider_fn(input: dict[str, object], ctx: ActionRunContext) -> Action | None:
+    def provider_fn(input: dict[str, object], ctx: ActionRunContext) -> object:
+        from genkit.blocks.resource import resource
+
         kind = cast(ActionKind, input['kind'])
         name = cast(str, input['name'])
         if kind == ActionKind.RESOURCE and name.startswith('dynamic://'):
 
             async def dyn_res_fn(input: ResourceInput, ctx: ActionRunContext) -> ResourceOutput:
                 return ResourceOutput(content=[Part(root=TextPart(text=f'Dynamic content for {input.uri}'))])
 
-            return Action(kind=ActionKind.RESOURCE, name=name, fn=dyn_res_fn)
+            return resource({'uri': name}, dyn_res_fn)
         return None
 
     # Register the provider as an action (it effectively acts as a factory)

py/packages/genkit/tests/genkit/ai/resource_test.py

@@ -203,15 +203,8 @@ async def my_resource_fn(input: ResourceInput, ctx: ActionRunContext) -> dict[st
     res = resource({'uri': 'http://example.com/foo'}, my_resource_fn)
     assert res.matches is not None
 
-    class MockInput:
-        uri = 'http://example.com/foo'
-
-    assert res.matches(MockInput())
-
-    class MockInputBad:
-        uri = 'http://example.com/bar'
-
-    assert not res.matches(MockInputBad())
+    assert res.matches(ResourceInput(uri='http://example.com/foo'))
+    assert not res.matches(ResourceInput(uri='http://example.com/bar'))
 
 
 def test_template_matching() -> None:
@@ -228,16 +221,10 @@ async def my_resource_fn(input: ResourceInput, ctx: ActionRunContext) -> dict[st
     res = resource({'template': 'http://example.com/items/{id}'}, my_resource_fn)
     assert res.matches is not None
 
-    class MockInput:
-        uri = 'http://example.com/items/123'
-
-    assert res.matches(MockInput())
-
-    class MockInputBad:
-        uri = 'http://example.com/items/123/details'
+    assert res.matches(ResourceInput(uri='http://example.com/items/123'))
 
     # Should not match because of strict end anchor or slash handling in our regex
-    assert not res.matches(MockInputBad())
+    assert not res.matches(ResourceInput(uri='http://example.com/items/123/details'))
 
 
 def test_reserved_expansion_matching() -> None:
@@ -254,16 +241,10 @@ async def my_resource_fn(input: ResourceInput, ctx: ActionRunContext) -> dict[st
     res = resource({'template': 'http://example.com/files/{+path}'}, my_resource_fn)
     assert res.matches is not None
 
-    class MockInput:
-        uri = 'http://example.com/files/foo/bar/baz.txt'
-
-    assert res.matches(MockInput())
+    assert res.matches(ResourceInput(uri='http://example.com/files/foo/bar/baz.txt'))
 
     # Regular template {path} regex ([^/]+) should NOT match slashes
     res_simple = resource({'template': 'http://example.com/items/{id}'}, my_resource_fn)
     assert res_simple.matches is not None
 
-    class MockInputComplex:
-        uri = 'http://example.com/items/foo/bar'
-
-    assert not res_simple.matches(MockInputComplex())
+    assert not res_simple.matches(ResourceInput(uri='http://example.com/items/foo/bar'))