Remove version_name

apache · Nov 13, 2024 · ef8cce6 · ef8cce6
1 parent ad03d9d
commit ef8cce6
Show file tree

Hide file tree

Showing 25 changed files with 144 additions and 268 deletions.
diff --git a/airflow/api_connexion/endpoints/dag_source_endpoint.py b/airflow/api_connexion/endpoints/dag_source_endpoint.py
@@ -44,16 +44,13 @@
 def get_dag_source(
     *,
     dag_id: str,
-    version_name: str | None = None,
     version_number: int | None = None,
     session: Session = NEW_SESSION,
 ) -> Response:
     """Get source code from DagCode."""
-    dag_version = DagVersion.get_version(dag_id, version_number, version_name, session=session)
+    dag_version = DagVersion.get_version(dag_id, version_number, session=session)
     if not dag_version:
-        raise NotFound(
-            f"The source code of the DAG {dag_id}, version {version_name} and version_number {version_number} was not found"
-        )
+        raise NotFound(f"The source code of the DAG {dag_id}, version_number {version_number} was not found")
     path = dag_version.dag_code.fileloc
     dag_ids = session.scalars(select(DagModel.dag_id).where(DagModel.fileloc == path)).all()
     requests: Sequence[IsAuthorizedDagRequest] = [
@@ -69,7 +66,6 @@ def get_dag_source(
         raise PermissionDenied()
     dag_source = dag_version.dag_code.source_code
     version_number = dag_version.version_number
-    version_name = dag_version.version_name
 
     return_type = request.accept_mimetypes.best_match(["text/plain", "application/json"])
     if return_type == "text/plain":
@@ -79,7 +75,6 @@ def get_dag_source(
             {
                 "content": dag_source,
                 "dag_id": dag_id,
-                "version_name": version_name,
                 "version_number": version_number,
             }
         )

diff --git a/airflow/api_connexion/openapi/v1.yaml b/airflow/api_connexion/openapi/v1.yaml
@@ -2274,7 +2274,6 @@ paths:
       operationId: get_dag_source
       tags: [DAG]
       parameters:
-        - $ref: "#/components/parameters/VersionName"
         - $ref: "#/components/parameters/VersionNumber"
       responses:
         "200":
@@ -5787,13 +5786,6 @@ components:
       description: |
         List of field for return.
 
-    VersionName:
-      in: query
-      name: version_name
-      schema:
-        type: string
-      description: |
-        The name of the version.
     VersionNumber:
       in: query
       name: version_number

diff --git a/airflow/api_connexion/schemas/dag_source_schema.py b/airflow/api_connexion/schemas/dag_source_schema.py
@@ -24,7 +24,6 @@ class DagSourceSchema(Schema):
 
     content = fields.String(dump_only=True)
     dag_id = fields.String(dump_only=True)
-    version_name = fields.String(dump_only=True)
     version_number = fields.Integer(dump_only=True)
 
 

diff --git a/airflow/api_fastapi/core_api/datamodels/dag_sources.py b/airflow/api_fastapi/core_api/datamodels/dag_sources.py
@@ -24,5 +24,4 @@ class DAGSourceResponse(BaseModel):
 
     content: str | None
     dag_id: str
-    version_name: str | None
     version_number: int | None
diff --git a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
@@ -1448,14 +1448,6 @@ paths:
         schema:
           type: string
           title: Dag Id
-      - name: version_name
-        in: query
-        required: false
-        schema:
-          anyOf:
-          - type: string
-          - type: 'null'
-          title: Version Name
       - name: version_number
         in: query
         required: false
@@ -4173,11 +4165,6 @@ components:
         dag_id:
           type: string
           title: Dag Id
-        version_name:
-          anyOf:
-          - type: string
-          - type: 'null'
-          title: Version Name
         version_number:
           anyOf:
           - type: integer
@@ -4187,7 +4174,6 @@ components:
       required:
       - content
       - dag_id
-      - version_name
       - version_number
       title: DAGSourceResponse
       description: DAG Source serializer for responses.

diff --git a/airflow/api_fastapi/core_api/routes/public/dag_sources.py b/airflow/api_fastapi/core_api/routes/public/dag_sources.py
@@ -72,9 +72,7 @@ async def get_dag_source(
 
     dag_source = dag_version.dag_code.source_code
     version_number = dag_version.version_number
-    dag_source_model = DAGSourceResponse(
-        dag_id=dag_id, content=dag_source, version_number=version_number
-    )
+    dag_source_model = DAGSourceResponse(dag_id=dag_id, content=dag_source, version_number=version_number)
 
     if accept.startswith(mime_type_text):
         return Response(dag_source_model.content, media_type=mime_type_text)

diff --git a/airflow/migrations/versions/0047_3_0_0_add_dag_versioning.py b/airflow/migrations/versions/0047_3_0_0_add_dag_versioning.py
@@ -57,7 +57,6 @@ def upgrade():
         "dag_version",
         sa.Column("id", UUIDType(binary=False), nullable=False),
         sa.Column("version_number", sa.Integer(), nullable=False),
-        sa.Column("version_name", StringID()),
         sa.Column("dag_id", StringID(), nullable=False),
         sa.Column("created_at", UtcDateTime(), nullable=False, default=timezone.utcnow),
         sa.ForeignKeyConstraint(

diff --git a/airflow/models/dag.py b/airflow/models/dag.py
@@ -424,7 +424,6 @@ class DAG(TaskSDKDag, LoggingMixin):
         **Warning**: A fail stop dag can only have tasks with the default trigger rule ("all_success").
         An exception will be thrown if any task in a fail stop dag has a non default trigger rule.
     :param dag_display_name: The display name of the DAG which appears on the UI.
-    :param version_name: The version name to use in storing the dag to the DB.
     """
 
     partial: bool = False

diff --git a/airflow/models/dag_version.py b/airflow/models/dag_version.py
@@ -43,7 +43,6 @@ class DagVersion(Base):
     __tablename__ = "dag_version"
     id = Column(UUIDType(binary=False), primary_key=True, default=uuid6.uuid7)
     version_number = Column(Integer, nullable=False, default=1)
-    version_name = Column(StringID())
     dag_id = Column(StringID(), ForeignKey("dag.dag_id", ondelete="CASCADE"), nullable=False)
     dag_model = relationship("DagModel", back_populates="dag_versions")
     dag_code = relationship(
@@ -78,7 +77,6 @@ def write_dag(
         cls,
         *,
         dag_id: str,
-        version_name: str | None = None,
         version_number: int = 1,
         session: Session = NEW_SESSION,
     ) -> DagVersion:
@@ -88,7 +86,6 @@ def write_dag(
         Checks if a version of the DAG exists and increments the version number if it does.
 
         :param dag_id: The DAG ID.
-        :param version_name: The version name.
         :param version_number: The version number.
         :param session: The database session.
         :return: The DagVersion object.
@@ -102,7 +99,6 @@ def write_dag(
         dag_version = DagVersion(
             dag_id=dag_id,
             version_number=version_number,
-            version_name=version_name,
         )
         log.debug("Writing DagVersion %s to the DB", dag_version)
         session.add(dag_version)
@@ -137,7 +133,6 @@ def get_version(
         cls,
         dag_id: str,
         version_number: int | None = None,
-        version_name: str | None = None,
         *,
         session: Session = NEW_SESSION,
     ) -> DagVersion | None:
@@ -146,22 +141,16 @@ def get_version(
 
         :param dag_id: The DAG ID.
         :param version_number: The version number.
-        :param version_name: The version name.
         :param session: The database session.
         :return: The version of the DAG or None if not found.
         """
         version_select_obj = select(cls).where(cls.dag_id == dag_id)
         if version_number:
             version_select_obj = version_select_obj.where(cls.version_number == version_number)
-        if version_name:
-            version_select_obj = version_select_obj.where(cls.version_name == version_name)
 
         return session.scalar(version_select_obj.order_by(cls.id.desc()).limit(1))
 
     @property
     def version(self) -> str:
         """A human-friendly representation of the version."""
-        name = f"{self.version_number}"
-        if self.version_name:
-            name = f"{self.version_name}-{self.version_number}"
-        return name
+        return f"{self.dag_id}-{self.version_number}"
diff --git a/airflow/models/serialized_dag.py b/airflow/models/serialized_dag.py
@@ -207,7 +207,6 @@ def write_dag(
             log.debug("Serialized DAG (%s) is unchanged. Skipping writing to DB", dag.dag_id)
             return False
         dagv = DagVersion.write_dag(
-            version_name=dag.version_name,
             dag_id=dag.dag_id,
             session=session,
         )

diff --git a/airflow/serialization/schema.json b/airflow/serialization/schema.json
@@ -158,7 +158,6 @@
         },
         "dag_display_name": { "type" : "string"},
         "description": { "type" : "string"},
-          "version_name": {"type":  "string"},
         "_concurrency": { "type" : "number"},
         "max_active_tasks": { "type" : "number"},
         "max_active_runs": { "type" : "number"},

diff --git a/airflow/ui/openapi-gen/queries/common.ts b/airflow/ui/openapi-gen/queries/common.ts
@@ -364,18 +364,16 @@ export const UseDagSourceServiceGetDagSourceKeyFn = (
   {
     accept,
     dagId,
-    versionName,
     versionNumber,
   }: {
     accept?: string;
     dagId: string;
-    versionName?: string;
     versionNumber?: number;
   },
   queryKey?: Array<unknown>,
 ) => [
   useDagSourceServiceGetDagSourceKey,
-  ...(queryKey ?? [{ accept, dagId, versionName, versionNumber }]),
+  ...(queryKey ?? [{ accept, dagId, versionNumber }]),
 ];
 export type EventLogServiceGetEventLogDefaultResponse = Awaited<
   ReturnType<typeof EventLogService.getEventLog>

diff --git a/airflow/ui/openapi-gen/queries/prefetch.ts b/airflow/ui/openapi-gen/queries/prefetch.ts
@@ -455,7 +455,6 @@ export const prefetchUseDagRunServiceGetDagRun = (
  * Get source code using file token.
  * @param data The data for the request.
  * @param data.dagId
- * @param data.versionName
  * @param data.versionNumber
  * @param data.accept
  * @returns DAGSourceResponse Successful Response
@@ -466,29 +465,21 @@ export const prefetchUseDagSourceServiceGetDagSource = (
   {
     accept,
     dagId,
-    versionName,
     versionNumber,
   }: {
     accept?: string;
     dagId: string;
-    versionName?: string;
     versionNumber?: number;
   },
 ) =>
   queryClient.prefetchQuery({
     queryKey: Common.UseDagSourceServiceGetDagSourceKeyFn({
       accept,
       dagId,
-      versionName,
       versionNumber,
     }),
     queryFn: () =>
-      DagSourceService.getDagSource({
-        accept,
-        dagId,
-        versionName,
-        versionNumber,
-      }),
+      DagSourceService.getDagSource({ accept, dagId, versionNumber }),
   });
 /**
  * Get Event Log

diff --git a/airflow/ui/openapi-gen/queries/queries.ts b/airflow/ui/openapi-gen/queries/queries.ts
@@ -568,7 +568,6 @@ export const useDagRunServiceGetDagRun = <
  * Get source code using file token.
  * @param data The data for the request.
  * @param data.dagId
- * @param data.versionName
  * @param data.versionNumber
  * @param data.accept
  * @returns DAGSourceResponse Successful Response
@@ -582,29 +581,22 @@ export const useDagSourceServiceGetDagSource = <
   {
     accept,
     dagId,
-    versionName,
     versionNumber,
   }: {
     accept?: string;
     dagId: string;
-    versionName?: string;
     versionNumber?: number;
   },
   queryKey?: TQueryKey,
   options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
 ) =>
   useQuery<TData, TError>({
     queryKey: Common.UseDagSourceServiceGetDagSourceKeyFn(
-      { accept, dagId, versionName, versionNumber },
+      { accept, dagId, versionNumber },
       queryKey,
     ),
     queryFn: () =>
-      DagSourceService.getDagSource({
-        accept,
-        dagId,
-        versionName,
-        versionNumber,
-      }) as TData,
+      DagSourceService.getDagSource({ accept, dagId, versionNumber }) as TData,
     ...options,
   });
 /**

diff --git a/airflow/ui/openapi-gen/queries/suspense.ts b/airflow/ui/openapi-gen/queries/suspense.ts
@@ -553,7 +553,6 @@ export const useDagRunServiceGetDagRunSuspense = <
  * Get source code using file token.
  * @param data The data for the request.
  * @param data.dagId
- * @param data.versionName
  * @param data.versionNumber
  * @param data.accept
  * @returns DAGSourceResponse Successful Response
@@ -567,29 +566,22 @@ export const useDagSourceServiceGetDagSourceSuspense = <
   {
     accept,
     dagId,
-    versionName,
     versionNumber,
   }: {
     accept?: string;
     dagId: string;
-    versionName?: string;
     versionNumber?: number;
   },
   queryKey?: TQueryKey,
   options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
 ) =>
   useSuspenseQuery<TData, TError>({
     queryKey: Common.UseDagSourceServiceGetDagSourceKeyFn(
-      { accept, dagId, versionName, versionNumber },
+      { accept, dagId, versionNumber },
       queryKey,
     ),
     queryFn: () =>
-      DagSourceService.getDagSource({
-        accept,
-        dagId,
-        versionName,
-        versionNumber,
-      }) as TData,
+      DagSourceService.getDagSource({ accept, dagId, versionNumber }) as TData,
     ...options,
   });
 /**

diff --git a/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow/ui/openapi-gen/requests/schemas.gen.ts
@@ -1343,17 +1343,6 @@ export const $DAGSourceResponse = {
       type: "string",
       title: "Dag Id",
     },
-    version_name: {
-      anyOf: [
-        {
-          type: "string",
-        },
-        {
-          type: "null",
-        },
-      ],
-      title: "Version Name",
-    },
     version_number: {
       anyOf: [
         {
@@ -1367,7 +1356,7 @@ export const $DAGSourceResponse = {
     },
   },
   type: "object",
-  required: ["content", "dag_id", "version_name", "version_number"],
+  required: ["content", "dag_id", "version_number"],
   title: "DAGSourceResponse",
   description: "DAG Source serializer for responses.",
 } as const;

diff --git a/airflow/ui/openapi-gen/requests/services.gen.ts b/airflow/ui/openapi-gen/requests/services.gen.ts
@@ -904,7 +904,6 @@ export class DagSourceService {
    * Get source code using file token.
    * @param data The data for the request.
    * @param data.dagId
-   * @param data.versionName
    * @param data.versionNumber
    * @param data.accept
    * @returns DAGSourceResponse Successful Response
@@ -923,7 +922,6 @@ export class DagSourceService {
         accept: data.accept,
       },
       query: {
-        version_name: data.versionName,
         version_number: data.versionNumber,
       },
       errors: {