WIP: finish rebase

src/intelligence_layer/core/__init__.py

@@ -19,6 +19,8 @@
 from .explain import Explain as Explain
 from .explain import ExplainInput as ExplainInput
 from .explain import ExplainOutput as ExplainOutput
+from .instruct import Instruct as Instruct
+from .instruct import InstructInput as InstructInput
 from .intelligence_app import (
     AuthenticatedIntelligenceApp as AuthenticatedIntelligenceApp,
 )

src/intelligence_layer/evaluation/argilla.py

@@ -12,7 +12,7 @@
     Question,
     RecordData,
 )
-from intelligence_layer.core import Input, InstructInput, Output, PromptOutput
+from intelligence_layer.core import CompleteOutput, Input, InstructInput, Output
 from intelligence_layer.evaluation import Aggregator
 from intelligence_layer.evaluation.accumulator import MeanAccumulator
 from intelligence_layer.evaluation.base_logic import AggregationLogic, EvaluationLogic
@@ -200,7 +200,7 @@ def aggregate(
 
 
 class InstructComparisonArgillaEvaluationLogic(
-    ArgillaEvaluationLogic[InstructInput, PromptOutput, None]
+    ArgillaEvaluationLogic[InstructInput, CompleteOutput, None]
 ):
     def __init__(
         self,
@@ -215,11 +215,11 @@ def __init__(
     def _to_record(
         self,
         example: Example[InstructInput, None],
-        *outputs: SuccessfulExampleOutput[PromptOutput],
+        *outputs: SuccessfulExampleOutput[CompleteOutput],
     ) -> RecordDataSequence:
         def create_record_data(
-            first: SuccessfulExampleOutput[PromptOutput],
-            second: SuccessfulExampleOutput[PromptOutput],
+            first: SuccessfulExampleOutput[CompleteOutput],
+            second: SuccessfulExampleOutput[CompleteOutput],
         ) -> RecordData:
             if random.choice([True, False]):
                 first, second = second, first

src/intelligence_layer/use_cases/__init__.py

@@ -63,15 +63,21 @@
     AggregatedSummarizeEvaluation as AggregatedSummarizeEvaluation,
 )
 from .summarize.summarize import (
-    LongContextSummarizeEvaluator as LongContextSummarizeEvaluator,
+    LongContextSummarizeAggregationLogic as LongContextSummarizeAggregationLogic,
+)
+from .summarize.summarize import (
+    LongContextSummarizeEvaluationLogic as LongContextSummarizeEvaluationLogic,
 )
 from .summarize.summarize import LongContextSummarizeInput as LongContextSummarizeInput
 from .summarize.summarize import (
     LongContextSummarizeOutput as LongContextSummarizeOutput,
 )
 from .summarize.summarize import PartialSummary as PartialSummary
 from .summarize.summarize import (
-    SingleChunkSummarizeEvaluator as SingleChunkSummarizeEvaluator,
+    SingleChunkSummarizeAggregationLogic as SingleChunkSummarizeAggregationLogic,
+)
+from .summarize.summarize import (
+    SingleChunkSummarizeEvaluationLogic as SingleChunkSummarizeEvaluationLogic,
 )
 from .summarize.summarize import SingleChunkSummarizeInput as SingleChunkSummarizeInput
 from .summarize.summarize import SummarizeEvaluation as SummarizeEvaluation

tests/use_cases/summarize/test_summarize.py

@@ -5,6 +5,7 @@
     Aggregator,
     DatasetRepository,
     EvaluationRepository,
+    Evaluator,
     Example,
     InMemoryDatasetRepository,
     InMemoryEvaluationRepository,
@@ -16,7 +17,9 @@
     InMemoryAggregationRepository,
 )
 from intelligence_layer.use_cases import (
-    LongContextSummarizeEvaluator,
+    AggregatedSummarizeEvaluation,
+    LongContextSummarizeAggregationLogic,
+    LongContextSummarizeEvaluationLogic,
     LongContextSummarizeInput,
     LongContextSummarizeOutput,
     SingleChunkSummarizeAggregationLogic,
@@ -60,7 +63,7 @@ def single_chunk_summarize_aggregator(
     in_memory_evaluation_repository: InMemoryEvaluationRepository,
     in_memory_aggregation_repository: InMemoryAggregationRepository,
     single_chunk_summarize_aggregation_logic: SingleChunkSummarizeAggregationLogic,
-) -> Aggregator[SummarizeEvaluation, AggregatedSummarizeEvaluation,]:
+) -> Aggregator[SummarizeEvaluation, AggregatedSummarizeEvaluation]:
     return Aggregator(
         in_memory_evaluation_repository,
         in_memory_aggregation_repository,