fix anntation, add collect demo

Author: allmonday

fe-demo/.nvmrc

@@ -0,0 +1 @@
+18.19.0

requirement.txt

@@ -8,9 +8,8 @@ greenlet==3.0.1
 h11==0.14.0
 httptools==0.6.1
 idna==3.6
-pydantic==2.5.2
-pydantic2-resolve==2.0.0
-pydantic_core==2.14.5
+pydantic==2.7.0
+pydantic2-resolve==2.1.1
 python-dotenv==1.0.0
 PyYAML==6.0.1
 sniffio==1.3.0

src/router/sample_1/schema.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Optional
 from pydantic_resolve import LoaderDepend
 from pydantic import ConfigDict
@@ -14,25 +16,6 @@
 import src.services.team.schema as tms
 
 
-class Sample1TaskDetail(ts.Task):
-    user: Optional[us.User] = None
-    def resolve_user(self, loader=LoaderDepend(ul.user_batch_loader)):
-        return loader.load(self.owner_id)
-
-class Sample1StoryDetail(ss.Story):
-    tasks: list[Sample1TaskDetail] = []
-    def resolve_tasks(self, loader=LoaderDepend(tl.story_to_task_loader)):
-        return loader.load(self.id)
-
-    owner: Optional[us.User] = None
-    def resolve_owner(self, loader=LoaderDepend(ul.user_batch_loader)):
-        return loader.load(self.owner_id)
-    
-class Sample1SprintDetail(sps.Sprint):
-    stories: list[Sample1StoryDetail] = []
-    def resolve_stories(self, loader=LoaderDepend(sl.sprint_to_story_loader)):
-        return loader.load(self.id)
-
 class Sample1TeamDetail(tms.Team):
     sprints: list[Sample1SprintDetail] = []
     def resolve_sprints(self, loader=LoaderDepend(spl.team_to_sprint_loader)):
@@ -47,4 +30,23 @@ class Sample1TeamDetail2(tms.Team):
 
     members: list[us.User] = []
     def resolve_members(self, loader=LoaderDepend(ul.team_to_user_loader)):
-        return loader.load(self.id)
+        return loader.load(self.id)
+
+class Sample1TaskDetail(ts.Task):
+    user: Optional[us.User] = None
+    def resolve_user(self, loader=LoaderDepend(ul.user_batch_loader)):
+        return loader.load(self.owner_id)
+
+class Sample1SprintDetail(sps.Sprint):
+    stories: list[Sample1StoryDetail] = []
+    def resolve_stories(self, loader=LoaderDepend(sl.sprint_to_story_loader)):
+        return loader.load(self.id)
+
+class Sample1StoryDetail(ss.Story):
+    tasks: list[Sample1TaskDetail] = []
+    def resolve_tasks(self, loader=LoaderDepend(tl.story_to_task_loader)):
+        return loader.load(self.id)
+
+    owner: Optional[us.User] = None
+    def resolve_owner(self, loader=LoaderDepend(ul.user_batch_loader)):
+        return loader.load(self.owner_id)

src/router/sample_4/schema.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 from typing import List, Optional
 from pydantic import Field
-from pydantic_resolve import LoaderDepend, model_config
+from pydantic_resolve import LoaderDepend, model_config, ICollector
 
 import src.services.task.loader as tl
 import src.services.user.loader as ul
@@ -13,22 +15,34 @@
 import src.services.sprint.schema as sps
 import src.services.team.schema as tms
 
-class Sample4TaskDetail(ts.Task):
-    user: Optional[us.User] = None
-    def resolve_user(self, loader=LoaderDepend(ul.user_batch_loader)):
-        return loader.load(self.owner_id)
+class CntCollector(ICollector):
+    def __init__(self, alias):
+        self.alias = alias
+        self.counter = 0
 
-# @model_config()
-class Sample4StoryDetail(ss.Story):
-    tasks: list[Sample4TaskDetail] = []
-    def resolve_tasks(self, loader=LoaderDepend(tl.story_to_task_loader)):
+    def add(self, val):
+        self.counter = self.counter + len(val)
+
+    def values(self):
+        return self.counter
+
+class Sample4TeamDetail(tms.Team):
+    sprints: list[Sample4SprintDetail] = []
+    def resolve_sprints(self, loader=LoaderDepend(spl.team_to_sprint_loader)):
         return loader.load(self.id)
-    
+
     task_count: int = 0
-    # task_count: int = Field(default=0, exclude=True)
     def post_task_count(self):
-        return len(self.tasks)
+        return sum([s.task_count for s in self.sprints])
+    
+    total_task_count: int = 0
+    def post_total_task_count(self, collector=CntCollector(alias='story_tasks')):
+        return collector.values()
 
+    description: str = ''
+    def post_default_handler(self):
+        self.description = f'team: "{self.name}" has {self.task_count} tasks in total.' 
+
 # @model_config()
 class Sample4SprintDetail(sps.Sprint):
     stories: list[Sample4StoryDetail] = []
@@ -40,15 +54,20 @@ def resolve_stories(self, loader=LoaderDepend(sl.sprint_to_story_loader)):
     def post_task_count(self):
         return sum([s.task_count for s in self.stories])
 
-class Sample4TeamDetail(tms.Team):
-    sprints: list[Sample4SprintDetail] = []
-    def resolve_sprints(self, loader=LoaderDepend(spl.team_to_sprint_loader)):
-        return loader.load(self.id)
+# @model_config()
+class Sample4StoryDetail(ss.Story):
+    __pydantic_resolve_collect__ = {'tasks': 'story_tasks'}
 
+    tasks: list[Sample4TaskDetail] = []
+    def resolve_tasks(self, loader=LoaderDepend(tl.story_to_task_loader)):
+        return loader.load(self.id)
+    
     task_count: int = 0
+    # task_count: int = Field(default=0, exclude=True)
     def post_task_count(self):
-        return sum([s.task_count for s in self.sprints])
-    
-    description: str = ''
-    def post_default_handler(self):
-        self.description = f'team: "{self.name}" has {self.task_count} tasks in total.' 
+        return len(self.tasks)
+
+class Sample4TaskDetail(ts.Task):
+    user: Optional[us.User] = None
+    def resolve_user(self, loader=LoaderDepend(ul.user_batch_loader)):
+        return loader.load(self.owner_id)