[GitHub] [airflow] bjoernpollex-sc commented on a change in pull request #5461: [AIRFLOW-4835] Refactor render_template

[GitBox <gi...@apache.org>]

bjoernpollex-sc commented on a change in pull request #5461: [AIRFLOW-4835] Refactor render_template
URL: https://github.com/apache/airflow/pull/5461#discussion_r310454645
 
 

 ##########
 File path: airflow/models/baseoperator.py
 ##########
 @@ -636,51 +636,73 @@ def __setstate__(self, state):
         self.__dict__ = state
         self._log = logging.getLogger("airflow.task.operators")
 
-    def render_template_from_field(self, attr, content, context, jinja_env):
+    def render_template_fields(self, context: Dict, jinja_env: Optional[jinja2.Environment] = None) -> None:
         """
-        Renders a template from a field. If the field is a string, it will
-        simply render the string and return the result. If it is a collection or
-        nested set of collections, it will traverse the structure and render
-        all elements in it. If the field has another type, it will return it as it is.
+        Template all attributes listed in template_fields. Note this operation is irreversible.
+
+        :param context: Dict with values to apply on content
+        :type context: dict
+        :param jinja_env: Jinja environment
+        :type jinja_env: jinja2.Environment
+        """
+
+        if not jinja_env:
+            jinja_env = self.get_template_env()
+
+        for attr_name in self.template_fields:
+            content = getattr(self, attr_name)
+            if content:
+                rendered_content = self.render_template(content, context, jinja_env)
+                setattr(self, attr_name, rendered_content)
+
+    def render_template(
+        self, content: Any, context: Dict, jinja_env: Optional[jinja2.Environment] = None
+    ) -> Any:
         """
-        rt = self.render_template
+        Render a templated string. The content can be a collection holding multiple templated strings and will
+        be templated recursively.
+
+        :param content: Content to template. Only strings can be templated (may be inside collection).
+        :type content: Any
+        :param context: Dict with values to apply on templated content
+        :type context: dict
+        :param jinja_env: Jinja environment. Can be provided to avoid re-creating Jinja environments during
+            recursion.
+        :type jinja_env: jinja2.Environment
+        :return: Templated content
+        """
+
+        if not jinja_env:
+            jinja_env = self.get_template_env()
+
         if isinstance(content, str):
-            result = jinja_env.from_string(content).render(**context)
-        elif isinstance(content, tuple):
+            if any([content.endswith(ext) for ext in self.template_ext]):
 
 Review comment:
   Minor comment: Using a list here prevents `any` from short-circuiting. You could just write:
   ```python
   any(content.endswith(ext) for ext in self.template_ext)
   ```

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services