corvic-engine 0.3.0rc43__cp38-abi3-win_amd64.whl → 0.3.0rc45__cp38-abi3-win_amd64.whl

corvic/model/_resource.py

@@ -95,10 +95,6 @@ class Resource(BaseModel[ResourceID, models_pb2.Resource, orm.Resource]):
     def description(self) -> str:
         return self.proto_self.description
 
-    @property
-    def source_ids(self) -> list[SourceID]:
-        return [SourceID(val) for val in self.proto_self.source_ids]
-
     @property
     def latest_event(self) -> event_pb2.Event | None:
         return (
@@ -122,9 +118,8 @@ class Resource(BaseModel[ResourceID, models_pb2.Resource, orm.Resource]):
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
         return [
-            sa_orm.selectinload(orm.Resource.source_associations),
-            sa_orm.selectinload(orm.Resource.pipeline_input_refs).selectinload(
-                orm.PipelineInput.pipeline
+            sa_orm.selectinload(orm.Resource.pipeline_ref).selectinload(
+                orm.PipelineInput.resource
             ),
         ]
 

corvic/model/_source.py

@@ -148,7 +148,6 @@ class Source(BaseModel[SourceID, models_pb2.Source, orm.Source]):
 
         proto_source = models_pb2.Source(
             name=name or resource.name,
-            resource_id=str(resource.id),
             room_id=str(room_id),
         )
 
@@ -191,11 +190,8 @@ class Source(BaseModel[SourceID, models_pb2.Source, orm.Source]):
     @classmethod
     def orm_load_options(cls) -> list[LoaderOption]:
         return [
-            sa_orm.selectinload(orm.Source.resource_associations).selectinload(
-                orm.SourceResourceAssociation.resource
-            ),
-            sa_orm.selectinload(orm.Source.pipeline_output_refs).selectinload(
-                orm.PipelineOutput.pipeline
+            sa_orm.selectinload(orm.Source.pipeline_ref).selectinload(
+                orm.PipelineOutput.source
             ),
         ]
 
@@ -215,18 +211,24 @@ class Source(BaseModel[SourceID, models_pb2.Source, orm.Source]):
         client = client or Defaults.get_default_client()
         additional_query_transform = None
 
-        def resource_filter(query: sa.Select[tuple[orm.Source]]):
-            return query.filter(
-                orm.Source.resource_associations.any(resource_id=resource.id)
-                | orm.Source.pipeline_output_refs.any(pipeline_id=resource.pipeline_id)
-            )
-
         if resource_id is not None:
             match Resource.from_id(resource_id, client):
                 case NotFoundError():
                     return NotFoundError("resource not found", resource_id=resource_id)
                 case Ok(resource):
+
+                    def resource_filter(query: sa.Select[tuple[orm.Source]]):
+                        return query.where(
+                            orm.Source.id.in_(
+                                sa.select(orm.PipelineOutput.source_id)
+                                .join(orm.Pipeline)
+                                .join(orm.PipelineInput)
+                                .where(orm.PipelineInput.resource_id == resource.id)
+                            )
+                        )
+
                     additional_query_transform = resource_filter
+
         match cls.list_as_proto(
             client,
             limit=limit,
@@ -278,7 +280,3 @@ class Source(BaseModel[SourceID, models_pb2.Source, orm.Source]):
     @property
     def pipeline_id(self) -> PipelineID | None:
         return PipelineID(self.proto_self.pipeline_id) or None
-
-    @property
-    def resource_ids(self) -> Sequence[ResourceID]:
-        return [ResourceID(self.proto_self.resource_id)]