Merge branch 'main' of https://github.com/GoogleCloudPlatform/dagify into fix/report-gen

Author: KonradSchieban

.github/workflows/python_workflow.yaml

@@ -25,9 +25,9 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Set up Python 3.10
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: "3.13"
+        python-version: "3.14"
 
     - name: Install dependencies
       run: |

dagify/converter/controlm.py

@@ -58,5 +58,5 @@ def __init__(
         convert(self, "control-m", "TASKTYPE", "JOBNAME")
         cal_dag_dividers(self)
         calc_dag_dependencies(self.uf, "controlm")
-        generate_airflow_dags(self, "JOBNAME_ORIGINAL")
+        generate_airflow_dags(self, "JOBNAME")
 

dagify/converter/uf.py

@@ -96,7 +96,7 @@ def calculate_dag_dependencies_controlm(self):
                     for obj in self.get_tasks():
                         for in_conds in obj.get_in_conditions():
                             if in_conds.get_attribute("NAME") == poutcon.get_attribute("NAME"):
-                                task.add_dependent_task(obj.get_dag_name(), obj.get_attribute("JOBNAME_ORIGINAL"))
+                                task.add_dependent_task(obj.get_dag_name(), obj.get_attribute("JOBNAME"))
         return
 
     def generate_dag_dependencies_by_divider(self, dag_divider, task_name):

dagify/converter/yaml_validator/custom_validator.py

@@ -14,18 +14,19 @@ def _is_valid(self, value):
     def fail(self, value):
         return f'{value} is not a valid email address.'
 
-
+#K.S. edit: Removing URL validator for now to avoid broken URL links to crash the tool.
+#           Additionally, requiring internet access for the tool might not be a good idea.
 class URLValidator(Validator):
     tag = 'validURL'  # This is the tag you use in your schema
 
     def _is_valid(self, value):
 
-        try:
-            response = requests.get(value)
-            return response.status_code == 200
-        except requests.exceptions.RequestException as e:
-            print(f"Error checking URL: {e}")
-
+        #try:
+        #    response = requests.get(value)
+        #    return response.status_code == 200
+        #except requests.exceptions.RequestException as e:
+        #    print(f"Error checking URL: {e}")
+        return True
 
 # Extend default validators with your custom validators
 validators = DefaultValidators.copy()

requirements.txt

@@ -11,7 +11,7 @@ pycodestyle==2.14.0
 pyflakes==3.4.0
 python-dateutil==2.9.0.post0
 pytz==2025.2
-PyYAML==6.0.2
+PyYAML==6.0.3
 six==1.17.0
 tzdata==2025.2
 yamale==6.0.0