Update app.py

app.py

@@ -196,8 +196,43 @@ class BaseGenerator(ABC):
         pass
         
     @abstractmethod
-    def generate(self, prompt: str, model_kwargs: Dict[str, Any], **kwargs) -> str:
-        pass
+    def generate(
+        self,
+        prompt: str,
+        model_kwargs: Dict[str, Any],
+        strategy: str = "default",
+        **kwargs
+    ) -> str:
+        """
+        Generate text based on a given strategy.
+    
+        Args:
+            prompt (str): Input prompt for text generation.
+            model_kwargs (Dict[str, Any]): Additional arguments for model generation.
+            strategy (str): The generation strategy to use (default: "default").
+            **kwargs: Additional arguments passed to the strategy.
+    
+        Returns:
+            str: Generated text response.
+    
+        Raises:
+            ValueError: If the specified strategy is not available.
+        """
+        # Validate that the strategy exists
+        if strategy not in self.strategies:
+            raise ValueError(f"Unknown strategy: {strategy}. Available strategies are: {list(self.strategies.keys())}")
+    
+        # Extract `generator` from kwargs if it exists to prevent duplication
+        kwargs.pop("generator", None)
+    
+        # Call the selected strategy with the provided arguments
+        return self.strategies[strategy].generate(
+            generator=self,            # The generator instance
+            prompt=prompt,             # The input prompt
+            model_kwargs=model_kwargs, # Arguments for the model
+            **kwargs                   # Any additional strategy-specific arguments
+        )
+
 
 # strategy.py
 #TODO UPDATE Paths
@@ -433,40 +468,41 @@ class LlamaGenerator(BaseGenerator):
         return " NOt implememnted yet "
         
     def generate(
-        self,
-        prompt: str,
-        model_kwargs: Dict[str, Any],
-        strategy: str = "default",
-        **kwargs
-    ) -> str:
-        """
-        Generate text based on a given strategy.
-    
-        Args:
-            prompt (str): Input prompt for text generation.
-            model_kwargs (Dict[str, Any]): Additional arguments for model generation.
-            strategy (str): The generation strategy to use (default: "default").
-            **kwargs: Additional arguments passed to the strategy.
-    
-        Returns:
-            str: Generated text response.
-    
-        Raises:
-            ValueError: If the specified strategy is not available.
-        """
-        # Validate that the strategy exists
-        if strategy not in self.strategies:
-            raise ValueError(f"Unknown strategy: {strategy}. Available strategies are: {list(self.strategies.keys())}")
-    
-        # Call the selected strategy with the provided arguments
-        return self.strategies[strategy].generate(
-            generator=self,            # The generator instance
-            prompt=prompt,             # The input prompt
-            model_kwargs=model_kwargs, # Arguments for the model
-            **kwargs                   # Any additional strategy-specific arguments
-        )
-
-
+            self,
+            prompt: str,
+            model_kwargs: Dict[str, Any],
+            strategy: str = "default",
+            **kwargs
+        ) -> str:
+            """
+            Generate text based on a given strategy.
+        
+            Args:
+                prompt (str): Input prompt for text generation.
+                model_kwargs (Dict[str, Any]): Additional arguments for model generation.
+                strategy (str): The generation strategy to use (default: "default").
+                **kwargs: Additional arguments passed to the strategy.
+        
+            Returns:
+                str: Generated text response.
+        
+            Raises:
+                ValueError: If the specified strategy is not available.
+            """
+            # Validate that the strategy exists
+            if strategy not in self.strategies:
+                raise ValueError(f"Unknown strategy: {strategy}. Available strategies are: {list(self.strategies.keys())}")
+        
+            # Extract `generator` from kwargs if it exists to prevent duplication
+            kwargs.pop("generator", None)
+        
+            # Call the selected strategy with the provided arguments
+            return self.strategies[strategy].generate(
+                generator=self,            # The generator instance
+                prompt=prompt,             # The input prompt
+                model_kwargs=model_kwargs, # Arguments for the model
+                **kwargs                   # Any additional strategy-specific arguments
+            )
 
     def generate_with_context(
         self,