Merge branch 'dev' into fix/api_settings

src/backend/base/langflow/load/__init__.py

@@ -1,3 +1,4 @@
-from .load import load_flow_from_json, run_flow_from_json  # noqa: F401
+from .load import load_flow_from_json, run_flow_from_json
+from .utils import upload_file, get_flow
 
-__all__ = ["load_flow_from_json", "run_flow_from_json"]
+__all__ = ["load_flow_from_json", "run_flow_from_json", "upload_file", "get_flow"]

src/backend/base/langflow/load/utils.py

@@ -0,0 +1,89 @@
+import httpx
+
+from langflow.services.database.models.flow.model import FlowBase
+
+
+def upload(file_path, host, flow_id):
+    """
+    Upload a file to Langflow and return the file path.
+
+    Args:
+        file_path (str): The path to the file to be uploaded.
+        host (str): The host URL of Langflow.
+        flow_id (UUID): The ID of the flow to which the file belongs.
+
+    Returns:
+        dict: A dictionary containing the file path.
+
+    Raises:
+        Exception: If an error occurs during the upload process.
+    """
+    try:
+        url = f"{host}/api/v1/upload/{flow_id}"
+        response = httpx.post(url, files={"file": open(file_path, "rb")})
+        if response.status_code == 200:
+            return response.json()
+        else:
+            raise Exception(f"Error uploading file: {response.status_code}")
+    except Exception as e:
+        raise Exception(f"Error uploading file: {e}")
+
+
+def upload_file(file_path, host, flow_id, components, tweaks={}):
+    """
+    Upload a file to Langflow and return the file path.
+
+    Args:
+        file_path (str): The path to the file to be uploaded.
+        host (str): The host URL of Langflow.
+        port (int): The port number of Langflow.
+        flow_id (UUID): The ID of the flow to which the file belongs.
+        components (str): List of component IDs or names that need the file.
+        tweaks (dict): A dictionary of tweaks to be applied to the file.
+
+    Returns:
+        dict: A dictionary containing the file path and any tweaks that were applied.
+
+    Raises:
+        Exception: If an error occurs during the upload process.
+    """
+    try:
+        response = upload(file_path, host, flow_id)
+        if response["file_path"]:
+            for component in components:
+                if isinstance(component, str):
+                    tweaks[component] = {"file_path": response["file_path"]}
+                else:
+                    raise ValueError(f"Component ID or name must be a string. Got {type(component)}")
+            return tweaks
+        else:
+            raise ValueError("Error uploading file")
+    except Exception as e:
+        raise ValueError(f"Error uploading file: {e}")
+
+
+def get_flow(url: str, flow_id: str):
+    """Get the details of a flow from Langflow.
+
+    Args:
+        url (str): The host URL of Langflow.
+        port (int): The port number of Langflow.
+        flow_id (UUID): The ID of the flow to retrieve.
+
+    Returns:
+        dict: A dictionary containing the details of the flow.
+
+    Raises:
+        Exception: If an error occurs during the retrieval process.
+    """
+    try:
+        flow_url = f"{url}/api/v1/flows/{flow_id}"
+        response = httpx.get(flow_url)
+        if response.status_code == 200:
+            json_response = response.json()
+            flow = FlowBase(**json_response).model_dump()
+            return flow
+        else:
+            raise Exception(f"Error retrieving flow: {response.status_code}")
+    except Exception as e:
+        raise Exception(f"Error retrieving flow: {e}")

src/backend/base/langflow/services/database/models/flow/model.py

@@ -29,7 +29,6 @@ class FlowBase(SQLModel):
     is_component: Optional[bool] = Field(default=False, nullable=True)
     updated_at: Optional[datetime] = Field(default_factory=lambda: datetime.now(timezone.utc), nullable=True)
     webhook: Optional[bool] = Field(default=False, nullable=True, description="Can be used on the webhook endpoint")
-    folder_id: Optional[UUID] = Field(default=None, nullable=True)
     endpoint_name: Optional[str] = Field(default=None, nullable=True, index=True)
 
     @field_validator("endpoint_name")