Collapse single-implementation Airflow trait layer

Cargo.toml

@@ -77,7 +77,6 @@ formula = "flowrs"
 ansi-to-tui = { version = "8.0.1" }
 anyhow = { workspace = true }
 catppuccin = { workspace = true }
-async-trait = { workspace = true }
 flowrs-config = { path = "crates/flowrs-config", version = "0.12.1" }
 flowrs-airflow = { path = "crates/flowrs-airflow", version = "0.11.1" }
 chrono = { workspace = true }

src/airflow/client/impls/dag_ops.rs

@@ -1,15 +1,12 @@
 use anyhow::Result;
-use async_trait::async_trait;
 
 use crate::airflow::client::convert_v1::v1_dag_collection_to_dag_list;
 use crate::airflow::client::convert_v2::v2_dag_list_to_dag_list;
 use crate::airflow::client::FlowrsClient;
 use crate::airflow::model::common::{Dag, DagList};
-use crate::airflow::traits::DagOperations;
 
-#[async_trait]
-impl DagOperations for FlowrsClient {
-    async fn list_dags(&self) -> Result<DagList> {
+impl FlowrsClient {
+    pub async fn list_dags(&self) -> Result<DagList> {
         match self {
             Self::V1(client) => {
                 let response = client.fetch_dags().await?;
@@ -22,21 +19,21 @@ impl DagOperations for FlowrsClient {
         }
     }
 
-    async fn toggle_dag(&self, dag_id: &str, is_paused: bool) -> Result<()> {
+    pub async fn toggle_dag(&self, dag_id: &str, is_paused: bool) -> Result<()> {
         match self {
             Self::V1(client) => client.patch_dag_pause(dag_id, is_paused).await,
             Self::V2(client) => client.patch_dag_pause(dag_id, is_paused).await,
         }
     }
 
-    async fn get_dag_code(&self, dag: &Dag) -> Result<String> {
+    pub async fn get_dag_code(&self, dag: &Dag) -> Result<String> {
         match self {
             Self::V1(client) => client.fetch_dag_code(&dag.file_token).await,
             Self::V2(client) => client.fetch_dag_code(&dag.dag_id).await,
         }
     }
 
-    async fn get_dag_params(&self, dag_id: &str) -> Result<Option<serde_json::Value>> {
+    pub async fn get_dag_params(&self, dag_id: &str) -> Result<Option<serde_json::Value>> {
         match self {
             Self::V1(client) => client.fetch_dag_params(dag_id).await,
             Self::V2(client) => client.fetch_dag_params(dag_id).await,

src/airflow/client/impls/dagrun_ops.rs

@@ -1,15 +1,12 @@
 use anyhow::Result;
-use async_trait::async_trait;
 
 use crate::airflow::client::convert_v1::v1_dagrun_collection_to_list;
 use crate::airflow::client::convert_v2::v2_dagrun_list_to_list;
 use crate::airflow::client::FlowrsClient;
 use crate::airflow::model::common::DagRunList;
-use crate::airflow::traits::DagRunOperations;
 
-#[async_trait]
-impl DagRunOperations for FlowrsClient {
-    async fn list_dagruns(&self, dag_id: &str) -> Result<DagRunList> {
+impl FlowrsClient {
+    pub async fn list_dagruns(&self, dag_id: &str) -> Result<DagRunList> {
         match self {
             Self::V1(client) => {
                 let response = client.fetch_dagruns(dag_id).await?;
@@ -22,21 +19,21 @@ impl DagRunOperations for FlowrsClient {
         }
     }
 
-    async fn mark_dag_run(&self, dag_id: &str, dag_run_id: &str, status: &str) -> Result<()> {
+    pub async fn mark_dag_run(&self, dag_id: &str, dag_run_id: &str, status: &str) -> Result<()> {
         match self {
             Self::V1(client) => client.patch_dag_run(dag_id, dag_run_id, status).await,
             Self::V2(client) => client.patch_dag_run(dag_id, dag_run_id, status).await,
         }
     }
 
-    async fn clear_dagrun(&self, dag_id: &str, dag_run_id: &str) -> Result<()> {
+    pub async fn clear_dagrun(&self, dag_id: &str, dag_run_id: &str) -> Result<()> {
         match self {
             Self::V1(client) => client.post_clear_dagrun(dag_id, dag_run_id).await,
             Self::V2(client) => client.post_clear_dagrun(dag_id, dag_run_id).await,
         }
     }
 
-    async fn trigger_dag_run(
+    pub async fn trigger_dag_run(
         &self,
         dag_id: &str,
         logical_date: Option<&str>,

src/airflow/client/impls/dagstats_ops.rs

@@ -1,15 +1,12 @@
 use anyhow::Result;
-use async_trait::async_trait;
 
 use crate::airflow::client::convert_v1::v1_dagstats_to_response;
 use crate::airflow::client::convert_v2::v2_dagstats_to_response;
 use crate::airflow::client::FlowrsClient;
 use crate::airflow::model::common::DagStatsResponse;
-use crate::airflow::traits::DagStatsOperations;
 
-#[async_trait]
-impl DagStatsOperations for FlowrsClient {
-    async fn get_dag_stats(&self, dag_ids: Vec<&str>) -> Result<DagStatsResponse> {
+impl FlowrsClient {
+    pub async fn get_dag_stats(&self, dag_ids: Vec<&str>) -> Result<DagStatsResponse> {
         match self {
             Self::V1(client) => {
                 let response = client.fetch_dag_stats(dag_ids).await?;

src/airflow/client/impls/log_ops.rs

@@ -1,15 +1,12 @@
 use anyhow::Result;
-use async_trait::async_trait;
 
 use crate::airflow::client::convert_v1::v1_log_to_log;
 use crate::airflow::client::convert_v2::v2_log_to_log;
 use crate::airflow::client::FlowrsClient;
 use crate::airflow::model::common::Log;
-use crate::airflow::traits::LogOperations;
 
-#[async_trait]
-impl LogOperations for FlowrsClient {
-    async fn get_task_logs(
+impl FlowrsClient {
+    pub async fn get_task_logs(
         &self,
         dag_id: &str,
         dag_run_id: &str,

src/airflow/client/impls/task_ops.rs

@@ -1,15 +1,12 @@
 use anyhow::Result;
-use async_trait::async_trait;
 
 use crate::airflow::client::convert_v1::v1_task_collection_to_list;
 use crate::airflow::client::convert_v2::v2_task_collection_to_list;
 use crate::airflow::client::FlowrsClient;
 use crate::airflow::model::common::TaskList;
-use crate::airflow::traits::TaskOperations;
 
-#[async_trait]
-impl TaskOperations for FlowrsClient {
-    async fn list_tasks(&self, dag_id: &str) -> Result<TaskList> {
+impl FlowrsClient {
+    pub async fn list_tasks(&self, dag_id: &str) -> Result<TaskList> {
         match self {
             Self::V1(client) => {
                 let response = client.fetch_tasks(dag_id).await?;

src/airflow/client/impls/taskinstance_ops.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use async_trait::async_trait;
 
 use crate::airflow::client::convert_v1::{
     v1_task_instance_collection_to_list, v1_task_instance_try_to_gantt,
@@ -9,11 +8,9 @@ use crate::airflow::client::convert_v2::{
 };
 use crate::airflow::client::FlowrsClient;
 use crate::airflow::model::common::{TaskInstanceList, TaskTryGantt};
-use crate::airflow::traits::TaskInstanceOperations;
 
-#[async_trait]
-impl TaskInstanceOperations for FlowrsClient {
-    async fn list_task_instances(
+impl FlowrsClient {
+    pub async fn list_task_instances(
         &self,
         dag_id: &str,
         dag_run_id: &str,
@@ -30,7 +27,7 @@ impl TaskInstanceOperations for FlowrsClient {
         }
     }
 
-    async fn list_task_instance_tries(
+    pub async fn list_task_instance_tries(
         &self,
         dag_id: &str,
         dag_run_id: &str,
@@ -60,7 +57,7 @@ impl TaskInstanceOperations for FlowrsClient {
         }
     }
 
-    async fn mark_task_instance(
+    pub async fn mark_task_instance(
         &self,
         dag_id: &str,
         dag_run_id: &str,
@@ -81,7 +78,7 @@ impl TaskInstanceOperations for FlowrsClient {
         }
     }
 
-    async fn clear_task_instance(
+    pub async fn clear_task_instance(
         &self,
         dag_id: &str,
         dag_run_id: &str,

src/airflow/client/mod.rs

@@ -9,11 +9,10 @@ use flowrs_airflow::client::{BaseClient, V1Client, V2Client};
 use flowrs_airflow::{AirflowConfig, AirflowVersion};
 
 use crate::airflow::model::common::OpenItem;
-use crate::airflow::traits::AirflowClient;
 
 use open_url::{build_v1_open_url, build_v2_open_url};
 
-/// Wrapper enum that owns a versioned Airflow HTTP client and implements the TUI trait layer.
+/// Wrapper enum that owns a versioned Airflow HTTP client and exposes the TUI-facing operations.
 #[derive(Debug)]
 pub enum FlowrsClient {
     V1(V1Client),
@@ -31,8 +30,8 @@ impl FlowrsClient {
     }
 }
 
-impl AirflowClient for FlowrsClient {
-    fn build_open_url(&self, item: &OpenItem) -> Result<String> {
+impl FlowrsClient {
+    pub fn build_open_url(&self, item: &OpenItem) -> Result<String> {
         match self {
             Self::V1(client) => build_v1_open_url(client.endpoint(), item),
             Self::V2(client) => build_v2_open_url(client.endpoint(), item),

src/airflow/mod.rs

@@ -1,4 +1,3 @@
 pub mod client;
 pub mod graph;
 pub mod model;
-pub mod traits;