[op] Rename PromptTemplatedGenerator to FormatStrPromptedGenerator (#424)

Author: SunnyHaze

dataflow/operators/core_text/__init__.py

@@ -2,7 +2,7 @@
 
 if TYPE_CHECKING:
     from .generate.prompted_generator import PromptedGenerator
-    from .generate.prompt_templated_generator import PromptTemplatedGenerator
+    from .generate.format_str_prompted_generator import FormatStrPromptedGenerator
     from .generate.random_domain_knowledge_row_generator import RandomDomainKnowledgeRowGenerator   
     from .generate.text2qa_generator import Text2QAGenerator
     from .generate.text2multihopqa_generator import Text2MultiHopQAGenerator

…t/generate/prompt_templated_generator.py …enerate/format_str_prompted_generator.pydataflow/operators/core_text/generate/prompt_templated_generator.py renamed to dataflow/operators/core_text/generate/format_str_prompted_generator.py dataflow/operators/core_text/generate/prompt_templated_generator.py renamed to dataflow/operators/core_text/generate/format_str_prompted_generator.py

@@ -9,17 +9,17 @@
 from dataflow.core.prompt import prompt_restrict, PromptABC, DIYPromptABC
 from typing import Union, Any, Set
 
-from dataflow.prompts.core_text import StrFormatPrompt
+from dataflow.prompts.core_text import FormatStrPrompt
 @prompt_restrict(
-    StrFormatPrompt,
+    FormatStrPrompt,
 )
 @OPERATOR_REGISTRY.register()
-class PromptTemplatedGenerator(OperatorABC):
+class FormatStrPromptedGenerator(OperatorABC):
     def __init__(
             self,
             llm_serving: LLMServingABC, 
             system_prompt: str =  "You are a helpful agent.",
-            prompt_template: Union[StrFormatPrompt, DIYPromptABC] = StrFormatPrompt,
+            prompt_template: Union[FormatStrPrompt, DIYPromptABC] = FormatStrPrompt,
             json_schema: dict = None,
         ):
         self.logger = get_logger()

dataflow/prompts/core_text.py

@@ -2,7 +2,7 @@
 from dataflow.core.prompt import PromptABC
 
 @PROMPT_REGISTRY.register()
-class StrFormatPrompt(PromptABC):
+class FormatStrPrompt(PromptABC):
     """
     Only the f_str_template needs to be provided.
     - Automatically parses the required fields from the template (self.fields)

…mplated_generator/double_column_input.py …_prompt_generator/double_column_input.pydataflow/statics/playground/playground/prompt_templated_generator/double_column_input.py renamed to dataflow/statics/playground/playground/format_str_prompt_generator/double_column_input.py dataflow/statics/playground/playground/prompt_templated_generator/double_column_input.py renamed to dataflow/statics/playground/playground/format_str_prompt_generator/double_column_input.py

@@ -1,8 +1,8 @@
-from dataflow.operators.core_text import PromptTemplatedGenerator
+from dataflow.operators.core_text import FormatStrPromptedGenerator
 from dataflow.serving import APILLMServing_request
 from dataflow.utils.storage import FileStorage
 
-from dataflow.prompts.core_text import StrFormatPrompt
+from dataflow.prompts.core_text import FormatStrPrompt
 
 
 class DoubleColumnInputTestCase():
@@ -19,10 +19,10 @@ def __init__(self):
             model_name="gpt-4o"
         )
 
-        self.prompt_template = StrFormatPrompt(
+        self.prompt_template = FormatStrPrompt(
             f_str_template="What does a {input_roll} like to {input_term}?"
         )
-        self.operator = PromptTemplatedGenerator(
+        self.operator = FormatStrPromptedGenerator(
             llm_serving=self.llm_serving,
             prompt_template=self.prompt_template
         )

dataflow/statics/playground/simple_text_pipelines/sft_from_scratch.py

@@ -1,10 +1,10 @@
 
 from dataflow.operators.text_sft import CondorGenerator
-from dataflow.operators.core_text import PromptedGenerator,PromptTemplatedGenerator
+from dataflow.operators.core_text import PromptedGenerator,FormatStrPromptedGenerator
 from dataflow.operators.core_text import GeneralFilter
 from dataflow.utils.storage import FileStorage
 from dataflow.serving import APILLMServing_request
-from dataflow.prompts.core_text import StrFormatPrompt
+from dataflow.prompts.core_text import FormatStrPrompt
 
 prompt = (
         "You are a senior content quality evaluator performing final assessment. "
@@ -42,10 +42,10 @@ def __init__(self):
         )
         self.instruction_generator = CondorGenerator(llm_serving=self.llm_serving, num_samples=self.num_generated_samples)
         self.answer_generator = PromptedGenerator(llm_serving=self.llm_serving, system_prompt="Please answer this question.")
-        self.prompt_template = StrFormatPrompt(
+        self.prompt_template = FormatStrPrompt(
             f_str_template="Please rate the following SFT data: instruction: {instruction}, output: {output}?"
         )
-        self.rater = PromptTemplatedGenerator(llm_serving=self.llm_serving, system_prompt = prompt, prompt_template=self.prompt_template)
+        self.rater = FormatStrPromptedGenerator(llm_serving=self.llm_serving, system_prompt = prompt, prompt_template=self.prompt_template)
         self.filter = GeneralFilter([lambda df: df['data_score'] >= 3])
 
     def forward(self):

…ors/core/my_prompt_template_generator.py …core/my_format_str_prompted_generator.pydataflow/statics/scaffold/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/operators/core/my_prompt_template_generator.py renamed to dataflow/statics/scaffold/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/operators/core/my_format_str_prompted_generator.py dataflow/statics/scaffold/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/operators/core/my_prompt_template_generator.py renamed to dataflow/statics/scaffold/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/operators/core/my_format_str_prompted_generator.py

@@ -8,18 +8,18 @@
 from dataflow.core.prompt import prompt_restrict, DIYPromptABC
 from typing import Union, Any
 
-from {{cookiecutter.package_name}}.prompts.core import MyStrFormatPrompt
+from {{cookiecutter.package_name}}.prompts.core import MyFormatStringPrompt
 
 @prompt_restrict(
-    MyStrFormatPrompt,
+    MyFormatStringPrompt,
 )
 @OPERATOR_REGISTRY.register()
-class MyPromptTemplatedGenerator(OperatorABC):
+class MyFormatStrPromptedGenerator(OperatorABC):
     def __init__(
             self,
             llm_serving: LLMServingABC, 
             system_prompt: str = "You are a helpful agent.",
-            prompt_template: Union[MyStrFormatPrompt, DIYPromptABC] = MyStrFormatPrompt,
+            prompt_template: Union[MyFormatStringPrompt, DIYPromptABC] = MyFormatStringPrompt,
             json_schema: dict = None,
         ):
         self.logger = get_logger()

dataflow/statics/scaffold/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/pipelines/my_pipeline.py

@@ -1,10 +1,10 @@
-from {{cookiecutter.package_name}}.operators.core.my_prompt_template_generator import MyPromptTemplatedGenerator
+from {{cookiecutter.package_name}}.operators.core.my_format_str_prompted_generator import MyFormatStrPromptedGenerator
 from {{cookiecutter.package_name}}.operators.core.my_prompted_generator import MyPromptedGenerator
 from dataflow.serving import APILLMServing_request
 from dataflow.utils.storage import FileStorage
 from dataflow.pipeline import PipelineABC
 
-from {{cookiecutter.package_name}}.prompts.core import MyStrFormatPrompt
+from {{cookiecutter.package_name}}.prompts.core import MyFormatStringPrompt
 
 class MySimplePipeline(PipelineABC):
     def __init__(self):
@@ -19,10 +19,10 @@ def __init__(self):
             api_url="https://api.openai.com/v1/chat/completions",   
             model_name="gpt-4o"
         )
-        self.prompt_template = MyStrFormatPrompt(
+        self.prompt_template = MyFormatStringPrompt(
             f_str_template="What does a {input_roll} like to {input_term}?"
         )
-        self.op1 = MyPromptTemplatedGenerator(
+        self.op1 = MyFormatStrPromptedGenerator(
             llm_serving=self.llm_serving,
             prompt_template=self.prompt_template
         )

dataflow/statics/scaffold/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/prompts/core.py

@@ -2,7 +2,7 @@
 from dataflow.core.prompt import PromptABC
 
 @PROMPT_REGISTRY.register()
-class MyStrFormatPrompt(PromptABC):
+class MyFormatStringPrompt(PromptABC):
     """
     Only the f_str_template needs to be provided.
     - Automatically parses the required fields from the template (self.fields)