apache-airflow-providers-edge3 1.4.1rc1__py3-none-any.whl → 1.4.1rc2__py3-none-any.whl

airflow/providers/edge3/plugins/www/src/main.tsx

@@ -18,13 +18,11 @@
  */
 import { ChakraProvider } from "@chakra-ui/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import axios from "axios";
 import { OpenAPI } from "openapi/requests/core/OpenAPI";
 import { FC } from "react";
 
 import { ColorModeProvider } from "src/context/colorMode";
 import { EdgeLayout } from "src/layouts/EdgeLayout";
-import { tokenHandler } from "src/utils";
 
 import { system } from "./theme";
 
@@ -39,9 +37,6 @@ const PluginComponent: FC<PluginComponentProps> = () => {
   const baseUrl = new URL(baseHref, globalThis.location.origin);
   OpenAPI.BASE = baseUrl.pathname.replace(/\/$/, ""); // Remove trailing slash
 
-  // ensure HTTP API calls are authenticated with current session token
-  axios.interceptors.request.use(tokenHandler);
-
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {

airflow/providers/edge3/plugins/www/src/utils/index.ts

@@ -19,4 +19,3 @@
 
 export { autoRefreshInterval } from "./config";
 export { useContainerWidth } from "./useContainerWidth";
-export { tokenHandler } from "./tokenHandler";

airflow/providers/edge3/worker_api/routes/_v2_compat.py

@@ -68,6 +68,7 @@ else:
         HTTP_204_NO_CONTENT = 204
         HTTP_400_BAD_REQUEST = 400
         HTTP_403_FORBIDDEN = 403
+        HTTP_404_NOT_FOUND = 404
         HTTP_500_INTERNAL_SERVER_ERROR = 500
 
     class HTTPException(ProblemException):  # type: ignore[no-redef]

airflow/providers/edge3/worker_api/routes/jobs.py

@@ -39,7 +39,6 @@ from airflow.providers.edge3.worker_api.routes._v2_compat import (
     status,
 )
 from airflow.stats import Stats
-from airflow.utils.sqlalchemy import with_row_locks
 from airflow.utils.state import TaskInstanceState
 
 jobs_router = AirflowRouter(tags=["Jobs"], prefix="/jobs")
@@ -78,8 +77,8 @@ def fetch(
     if body.queues:
         query = query.where(EdgeJobModel.queue.in_(body.queues))
     query = query.limit(1)
-    query = with_row_locks(query, of=EdgeJobModel, session=session, skip_locked=True)
-    job: EdgeJobModel = session.scalar(query)
+    query = query.with_for_update(skip_locked=True)
+    job: EdgeJobModel | None = session.scalar(query)
     if not job:
         return None
     job.state = TaskInstanceState.RUNNING
@@ -148,7 +147,7 @@ def state(
             )
             Stats.incr("edge_worker.ti.finish", tags=tags)
 
-    query = (
+    query2 = (
         update(EdgeJobModel)
         .where(
             EdgeJobModel.dag_id == dag_id,
@@ -159,4 +158,4 @@ def state(
         )
         .values(state=state, last_update=timezone.utcnow())
     )
-    session.execute(query)
+    session.execute(query2)

airflow/providers/edge3/worker_api/routes/ui.py

@@ -18,6 +18,7 @@
 from __future__ import annotations
 
 from datetime import datetime
+from typing import TYPE_CHECKING
 
 from fastapi import Depends, HTTPException, status
 from sqlalchemy import select
@@ -44,6 +45,10 @@ from airflow.providers.edge3.worker_api.datamodels_ui import (
     Worker,
     WorkerCollectionResponse,
 )
+from airflow.utils.state import TaskInstanceState
+
+if TYPE_CHECKING:
+    from sqlalchemy.engine import ScalarResult
 
 ui_router = AirflowRouter(tags=["UI"])
 
@@ -59,7 +64,7 @@ def worker(
 ) -> WorkerCollectionResponse:
     """Return Edge Workers."""
     query = select(EdgeWorkerModel).order_by(EdgeWorkerModel.worker_name)
-    workers: list[EdgeWorkerModel] = session.scalars(query)
+    workers: ScalarResult[EdgeWorkerModel] = session.scalars(query)
 
     result = [
         Worker(
@@ -91,7 +96,7 @@ def jobs(
 ) -> JobCollectionResponse:
     """Return Edge Jobs."""
     query = select(EdgeJobModel).order_by(EdgeJobModel.queued_dttm)
-    jobs: list[EdgeJobModel] = session.scalars(query)
+    jobs: ScalarResult[EdgeJobModel] = session.scalars(query)
 
     result = [
         Job(
@@ -100,7 +105,7 @@ def jobs(
             run_id=j.run_id,
             map_index=j.map_index,
             try_number=j.try_number,
-            state=j.state,
+            state=TaskInstanceState(j.state),
             queue=j.queue,
             queued_dttm=j.queued_dttm,
             edge_worker=j.edge_worker,

airflow/providers/edge3/worker_api/routes/worker.py

@@ -172,7 +172,7 @@ def register(
     """Register a new worker to the backend."""
     _assert_version(body.sysinfo)
     query = select(EdgeWorkerModel).where(EdgeWorkerModel.worker_name == worker_name)
-    worker: EdgeWorkerModel = session.scalar(query)
+    worker: EdgeWorkerModel | None = session.scalar(query)
     if not worker:
         worker = EdgeWorkerModel(worker_name=worker_name, state=body.state, queues=body.queues)
     worker.state = redefine_state(worker.state, body.state)
@@ -194,7 +194,9 @@ def set_state(
 ) -> WorkerSetStateReturn:
     """Set state of worker and returns the current assigned queues."""
     query = select(EdgeWorkerModel).where(EdgeWorkerModel.worker_name == worker_name)
-    worker: EdgeWorkerModel = session.scalar(query)
+    worker: EdgeWorkerModel | None = session.scalar(query)
+    if not worker:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, "Worker not found")
     worker.state = redefine_state(worker.state, body.state)
     worker.maintenance_comment = redefine_maintenance_comments(
         worker.maintenance_comment, body.maintenance_comments
@@ -213,7 +215,7 @@ def set_state(
         free_concurrency=int(body.sysinfo["free_concurrency"]),
         queues=worker.queues,
     )
-    _assert_version(body.sysinfo)  #  Exception only after worker state is in the DB
+    _assert_version(body.sysinfo)  # Exception only after worker state is in the DB
     return WorkerSetStateReturn(
         state=worker.state, queues=worker.queues, maintenance_comments=worker.maintenance_comment
     )
@@ -229,7 +231,9 @@ def update_queues(
     session: SessionDep,
 ) -> None:
     query = select(EdgeWorkerModel).where(EdgeWorkerModel.worker_name == worker_name)
-    worker: EdgeWorkerModel = session.scalar(query)
+    worker: EdgeWorkerModel | None = session.scalar(query)
+    if not worker:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, "Worker not found")
     if body.new_queues:
         worker.add_queues(body.new_queues)
     if body.remove_queues:

{apache_airflow_providers_edge3-1.4.1rc1.dist-info → apache_airflow_providers_edge3-1.4.1rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-edge3
-Version: 1.4.1rc1
+Version: 1.4.1rc2
 Summary: Provider package apache-airflow-providers-edge3 for Apache Airflow
 Keywords: airflow-provider,edge3,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>

{apache_airflow_providers_edge3-1.4.1rc1.dist-info → apache_airflow_providers_edge3-1.4.1rc2.dist-info}/RECORD

@@ -3,26 +3,26 @@ airflow/providers/edge3/__init__.py,sha256=YJGs4Uf4WWsejZd4Uumqg7rX6HFH8Z1mDA3I7
 airflow/providers/edge3/get_provider_info.py,sha256=Ek27-dB4UALHUFYoYjtoQIGq0p7zeHcEgmELHvpVmCU,6836
 airflow/providers/edge3/version_compat.py,sha256=JRhqYf4UklO3xwmtCRPSXLQqq0yD1pCts3bhwxgVC0s,1670
 airflow/providers/edge3/cli/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/edge3/cli/api_client.py,sha256=334KHVB4eMSzRpQ5emS56o-RTUJQprxf5Q3xQldCHDQ,7440
+airflow/providers/edge3/cli/api_client.py,sha256=IxG1dae4aemhO8yfKDA71PYSuBdf2ouGur8Cem1Ys4c,7489
 airflow/providers/edge3/cli/dataclasses.py,sha256=JUuvvmzSVWvG9uOEfzLIiXrTZ-HbESvu50jkPpVIYVw,2895
 airflow/providers/edge3/cli/edge_command.py,sha256=aZ8P9x9FBR_pyuDxi6LaLkz4ubGOBDk1RNNp0ppTbKY,21747
 airflow/providers/edge3/cli/signalling.py,sha256=sf4S6j6OoP0bLkda3UlCmlZabjv5wsMypy3kAvx56Z0,3220
-airflow/providers/edge3/cli/worker.py,sha256=tW99X4RQSFLZMaYbjJ8TMF7QVz1pIpWbi0D6M0KS_bI,17238
+airflow/providers/edge3/cli/worker.py,sha256=_ykOpA-io31TxOsjoGpfCtXPC60_E2boQJDjAtqSVIM,17626
 airflow/providers/edge3/example_dags/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/edge3/example_dags/integration_test.py,sha256=_bY2tVjUZvKAJXzm0Ozrwas0efRU4X9kULKWxu7LYB4,6264
 airflow/providers/edge3/example_dags/win_notepad.py,sha256=zYcrKqODN4KLZQ-5wNnZQQskrDd5LA-nKJNgKQDntSE,2832
 airflow/providers/edge3/example_dags/win_test.py,sha256=9iZ8Ro1Pi9RhYVcFFyyzpb6q3M0Qt8Ft1wJUF1O3dQc,13565
 airflow/providers/edge3/executors/__init__.py,sha256=y830gGSKCvjOcLwLuCDp84NCrHWWB9RSSH1qvJpFhyY,923
-airflow/providers/edge3/executors/edge_executor.py,sha256=IZw8HS80o6eYD2FVG9OR5t30-Z6dFyVl_x4NqmoA10A,19233
+airflow/providers/edge3/executors/edge_executor.py,sha256=_KWbjIe9KbosUKfoYZpeONNZnIdrqNK3ja3YzENL-pE,19336
 airflow/providers/edge3/models/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/edge3/models/edge_job.py,sha256=Q43X_PBnhG_u93fwyesWDS-6q4fQrjXPdoWgb1zAQl4,3569
+airflow/providers/edge3/models/edge_job.py,sha256=PQRZcrl8RCj9d8xvdNFit7UJ6zRxvME_gZBLyBTN_70,3621
 airflow/providers/edge3/models/edge_logs.py,sha256=rFVz4gR0GYiEpwai5Q2C5znkiuaUQTjq5EhfLnQUeZQ,3022
-airflow/providers/edge3/models/edge_worker.py,sha256=TavuZFmXO-evglU08JDr0TQMOaW-qiHvj6CRs2l481E,12942
+airflow/providers/edge3/models/edge_worker.py,sha256=kQV344idLt-ldk5Ru5V4g4RaaPlZA4H7XlWul5_KSuU,13789
 airflow/providers/edge3/openapi/__init__.py,sha256=0O-WvmDx8GeKSoECpHYrbe0hW-LgjlKny3VqTCpBQeQ,927
 airflow/providers/edge3/openapi/edge_worker_api_v1.yaml,sha256=GAE2IdOXmcUueNy5KFkLBgNpoWnOjnHT9TrW5NZEWpI,24938
 airflow/providers/edge3/openapi/v2-edge-generated.yaml,sha256=VBjkPbZjG73QiU75H7UK45q0lLpMsK5E45L9j-LQypI,39727
 airflow/providers/edge3/plugins/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/edge3/plugins/edge_executor_plugin.py,sha256=El-MxIVg6311LYCvbWviAU589TYrT8_TTEXt1PoGVmo,13063
+airflow/providers/edge3/plugins/edge_executor_plugin.py,sha256=VUPAH-goiwEWmlJy01Sp5X0tn_jkkiMrpCFURh4RyOY,13020
 airflow/providers/edge3/plugins/templates/edge_worker_hosts.html,sha256=0_P2yfZwpy3Kvqd3GBvu_PgmmKCUbso3ieW8aYa76iU,8997
 airflow/providers/edge3/plugins/templates/edge_worker_jobs.html,sha256=bZ-6ysmIy6j4eR_TPHiqbgb3qpNMKCcEEB-SpxuxNgc,2831
 airflow/providers/edge3/plugins/www/.gitignore,sha256=glCQO0xBUzFDPKNjn3_mw7F6e51j3sjyo4knJAUqMz4,281
@@ -40,7 +40,7 @@ airflow/providers/edge3/plugins/www/tsconfig.lib.json,sha256=Z5M3uhtIZ0Uc9CFjc7F
 airflow/providers/edge3/plugins/www/tsconfig.node.json,sha256=On9I0qUPqRSyxJNKP5OlnWX_rYR1CKZV8A3IgF1UxvE,680
 airflow/providers/edge3/plugins/www/vite.config.ts,sha256=mxAyXyZhIaFA46v7DY4yAo__y6gs9YXuIIPEhN-6xis,2971
 airflow/providers/edge3/plugins/www/dist/main.d.ts,sha256=eZKjnWzeXgUOt4RhqL-a2YYXWpSCboNcEQs5ZykL0kk,10
-airflow/providers/edge3/plugins/www/dist/main.umd.cjs,sha256=ep8ELl_od8R_ZgkIFQwbWy2mud0AQ80b86VQWbtFSaQ,561336
+airflow/providers/edge3/plugins/www/dist/main.umd.cjs,sha256=QA22cjW1aG-FJ-fnc437p52Iw7vNNisn75-c4QEHlFQ,560410
 airflow/providers/edge3/plugins/www/openapi-gen/queries/common.ts,sha256=mnY7x73LFNTprAZjwPRbl9W1VSmKXPflqtaQa4ocOxw,3531
 airflow/providers/edge3/plugins/www/openapi-gen/queries/ensureQueryData.ts,sha256=CCvoih7AKo7voklUkF6EjcjMMVB0HOTY53mBFn2Nly0,1317
 airflow/providers/edge3/plugins/www/openapi-gen/queries/index.ts,sha256=p941sYs7pyF4XLKPxPgBXIko0H6s2U4sowFygzJ6Jos,114
@@ -59,7 +59,7 @@ airflow/providers/edge3/plugins/www/openapi-gen/requests/core/CancelablePromise.
 airflow/providers/edge3/plugins/www/openapi-gen/requests/core/OpenAPI.ts,sha256=Gu0_JlDV061xLt7NF2w9zb2gpP84-rybL86sgX71Ef0,1477
 airflow/providers/edge3/plugins/www/openapi-gen/requests/core/request.ts,sha256=jG833drJAZFBKN9hnEL6RIRmAfys9eb5rC8p99wBWXk,9598
 airflow/providers/edge3/plugins/www/src/dev.tsx,sha256=5sZlduF3IFFXKZMxV06hLsxhcCuWNzUMM4Ni1RITG8w,1114
-airflow/providers/edge3/plugins/www/src/main.tsx,sha256=VdKKPV6q3oYr_k9g2u56_jpDHST-7QWqRy115PXq9S8,2189
+airflow/providers/edge3/plugins/www/src/main.tsx,sha256=mY1QGUj7UNDq1H0AbG5lOK1Z3889iQrtPGOfwOBEb3A,1999
 airflow/providers/edge3/plugins/www/src/theme.ts,sha256=6Fbo0Mwbah6HTupBYyUqOt_T8DAZtDG2UABtOoxUe1w,21458
 airflow/providers/edge3/plugins/www/src/vite-env.d.ts,sha256=eY6SmeO3WS4Bxne5yY6kn_PXLilnlFfluNuZswLUDys,848
 airflow/providers/edge3/plugins/www/src/components/AddQueueButton.tsx,sha256=Ahyf0_NXqEM0UjIdMyTuANKToD1coqfEjdsQiudK_Fg,4159
@@ -91,8 +91,7 @@ airflow/providers/edge3/plugins/www/src/res/README.md,sha256=v9BEjvcB_pOcCP0bCL8
 airflow/providers/edge3/plugins/www/src/res/cloud-computer-dark.svg,sha256=o_HFnxsF9M8BbBgIMXuAv3gO0Wc7owQDg5hvw-Pz3ek,368
 airflow/providers/edge3/plugins/www/src/res/cloud-computer.svg,sha256=oRbCGtHKdKwIqa3_540Np4Td5fkhu1YQ0n--OCRrkyw,365
 airflow/providers/edge3/plugins/www/src/utils/config.ts,sha256=XTd5NDxkuNshitc1pL6zANnwBnOh8srKnLGfoKJLL80,1118
-airflow/providers/edge3/plugins/www/src/utils/index.ts,sha256=IAP8x06DtpblvwRBr2n9XZeC4HoX45haHr8r-S80rKM,962
-airflow/providers/edge3/plugins/www/src/utils/tokenHandler.ts,sha256=aLNV3b1_vYL_FnwPExMZozUMFCtR0cATAXk7c0t92yM,1690
+airflow/providers/edge3/plugins/www/src/utils/index.ts,sha256=h1cm1iCT0LPIY_VzgKkstdUdIHodFoZW8SwSAUImQpA,915
 airflow/providers/edge3/plugins/www/src/utils/useContainerWidth.ts,sha256=lLNc0NGM9y9ao538_MvbTiOBK3UYhNfBPX_PvRslCSg,1386
 airflow/providers/edge3/worker_api/__init__.py,sha256=nnPvxWGTEKZ9YyB1Yd7P9IvDOenK01LVHm22Owwxj3g,839
 airflow/providers/edge3/worker_api/app.py,sha256=yM2S2JLYE2lS4kN88XYnbeKKRa8vqVVhRq10yA_X0ig,3003
@@ -100,14 +99,14 @@ airflow/providers/edge3/worker_api/auth.py,sha256=nmwfUz-nokUKyQp-UKwlMn-i2U5AXz
 airflow/providers/edge3/worker_api/datamodels.py,sha256=FAiXqnrSN8zH4YE2fUMjXfXcH9cHlhRh4uZvvr936Ys,6696
 airflow/providers/edge3/worker_api/datamodels_ui.py,sha256=yPEdtZ7noV5BBNXvA9F-pqVDq7UxTIKUdoUf3_FTDdE,2795
 airflow/providers/edge3/worker_api/routes/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/edge3/worker_api/routes/_v2_compat.py,sha256=PuzSL9dMuji_MsluCoPdCvYboqJD0h4zERcIoB5kJvI,4543
+airflow/providers/edge3/worker_api/routes/_v2_compat.py,sha256=R5w5XPBnOCr9AV-DXZFOP60CRaI9JwTR_kSXwMzt7HU,4576
 airflow/providers/edge3/worker_api/routes/_v2_routes.py,sha256=xcbf6RdOHx5zOl9JlIAW9nQhiy3ju-EIyq1tbXGJSYc,10800
 airflow/providers/edge3/worker_api/routes/health.py,sha256=1nRn_lvGhaMkGKGeEJbD_p7tJdMbC1LhEmwuQbqI9oE,1076
-airflow/providers/edge3/worker_api/routes/jobs.py,sha256=Hu32JwzPNpNHRrQlnqDhjKaJyH84K46fz1GExye4258,5755
+airflow/providers/edge3/worker_api/routes/jobs.py,sha256=oFf7E4IBX39npRyptISPy5ApgnKmXOwMJMefvF5iIcw,5678
 airflow/providers/edge3/worker_api/routes/logs.py,sha256=uk0SZ5hAimj3sAcq1FYCDu0AXYNeTeyjZDGBvw-986E,4945
-airflow/providers/edge3/worker_api/routes/ui.py,sha256=qXELQI6RZ80fLDTB0K6Z2H__ofJwRSvK6J1UYW3JC7g,9786
-airflow/providers/edge3/worker_api/routes/worker.py,sha256=UcB20SV5Nhpi22NI0H5BQjlX2U9PgaFbyDVNd9PYfhg,8991
-apache_airflow_providers_edge3-1.4.1rc1.dist-info/entry_points.txt,sha256=7WUIGfd3o9NvvbK5trbZxNXTgYGc6pqg74wZPigbx5o,206
-apache_airflow_providers_edge3-1.4.1rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_edge3-1.4.1rc1.dist-info/METADATA,sha256=GU_BxpNe7jG8o_t9p1cNBDXQB5yWbJgew7aBusUuFG4,6133
-apache_airflow_providers_edge3-1.4.1rc1.dist-info/RECORD,,
+airflow/providers/edge3/worker_api/routes/ui.py,sha256=yjdNQ7N0h7g7rSzsi4r5inwi4rxlHCdmtYA-ZTWRu6k,9970
+airflow/providers/edge3/worker_api/routes/worker.py,sha256=PWgD77rTOCqRGGp5TU4wYPbbu64aCbUrCgwLJEm9iQ8,9199
+apache_airflow_providers_edge3-1.4.1rc2.dist-info/entry_points.txt,sha256=7WUIGfd3o9NvvbK5trbZxNXTgYGc6pqg74wZPigbx5o,206
+apache_airflow_providers_edge3-1.4.1rc2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_edge3-1.4.1rc2.dist-info/METADATA,sha256=R_V8zpKp-1MoLwQjVizWBq_D0RoaJGy8aSBcjL0INx0,6133
+apache_airflow_providers_edge3-1.4.1rc2.dist-info/RECORD,,

airflow/providers/edge3/plugins/www/src/utils/tokenHandler.ts

@@ -1,51 +0,0 @@
-/*!
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import type { InternalAxiosRequestConfig } from "axios";
-
-export const TOKEN_STORAGE_KEY = "token";
-const getTokenFromCookies = (): string | undefined => {
-  const cookies = document.cookie.split(";");
-
-  for (const cookie of cookies) {
-    const [name, token] = cookie.split("=");
-
-    if (name?.trim() === "_token" && token !== undefined) {
-      localStorage.setItem(TOKEN_STORAGE_KEY, token);
-      document.cookie = "_token=; expires=Sat, 01 Jan 2000 00:00:00 UTC; path=/;";
-
-      return token;
-    }
-  }
-
-  return undefined;
-};
-
-export const tokenHandler = (config: InternalAxiosRequestConfig) => {
-  const token = localStorage.getItem(TOKEN_STORAGE_KEY) ?? getTokenFromCookies();
-
-  if (token !== undefined) {
-    config.headers.Authorization = `Bearer ${token}`;
-  }
-
-  return config;
-};
-
-export const clearToken = () => {
-  localStorage.removeItem(TOKEN_STORAGE_KEY);
-};