remove old test changes and old mock tests

Signed-off-by: Omswastik-11 <omswastikpanda11@gmail.com>

Author: Omswastik-11

openml/_api/resources/flow.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, NoReturn
 from urllib.parse import quote
 
 import pandas as pd
@@ -220,11 +220,11 @@ def list(
         offset: int | None = None,  # noqa: ARG002
         tag: str | None = None,  # noqa: ARG002
         uploader: str | None = None,  # noqa: ARG002
-    ) -> pd.DataFrame:
+    ) -> NoReturn:
         self._not_supported(method="list")
 
     @staticmethod
-    def _convert_v2_to_v1_format(v2_json: dict[str, Any]) -> dict[str, dict]:
+    def _convert_v2_to_v1_format(v2_json: dict[str, Any]) -> dict[str, Any]:
         """Convert v2 JSON response to v1 XML-dict format for OpenMLFlow._from_dict().
 
         Parameters

openml/flows/functions.py

@@ -48,15 +48,12 @@ def get_flow(
 
     Raises
     ------
-    OpenMLCacheException
-        When cached flow files are corrupted or cannot be read.
     OpenMLServerException
         When the REST API call fails.
 
     Side Effects
     ------------
-    - Writes to ``openml.config.cache_directory/flows/{flow_id}/flow.xml``
-      when the flow is downloaded from the server.
+    - Caches the retrieved flow using the HTTP client's caching mechanism.
 
     Preconditions
     -------------

tests/test_api/test_flow.py

@@ -24,13 +24,7 @@ def flow_v2(http_client_v2, minio_client) -> FlowV2API:
     return FlowV2API(http=http_client_v2, minio=minio_client)
 
 
-@pytest.fixture
-def with_v2_server_config(test_server_v1, test_server_v2) -> Iterator[None]:
-    old_server = openml.config.servers[APIVersion.V2]["server"]
-    derived_v2_server = test_server_v1.replace("/api/v1/xml/", "/api/v2/")
-    openml.config.servers[APIVersion.V2]["server"] = test_server_v2 or derived_v2_server
-    yield
-    openml.config.servers[APIVersion.V2]["server"] = old_server
+
 
 
 def _assert_flow_shape(flow: OpenMLFlow) -> None:
@@ -41,11 +35,13 @@ def _assert_flow_shape(flow: OpenMLFlow) -> None:
     assert len(flow.name) > 0
 
 
+@pytest.mark.test_server()
 def test_flow_v1_get(flow_v1):
     flow = flow_v1.get(flow_id=1)
     _assert_flow_shape(flow)
 
 
+@pytest.mark.test_server()
 def test_flow_v1_list(flow_v1):
     limit = 5
     flows_df = flow_v1.list(limit=limit)
@@ -59,6 +55,7 @@ def test_flow_v1_list(flow_v1):
     assert "uploader" in flows_df.columns
 
 
+@pytest.mark.test_server()
 def test_flow_v1_list_with_offset(flow_v1):
     limit = 5
     flows_df = flow_v1.list(limit=limit, offset=10)
@@ -166,33 +163,13 @@ def test_flow_v1_delete_mocked(flow_v1, test_apikey_v1):
         )
 
 
-def test_flow_v2_get(flow_v2, with_v2_server_config):
-    v2_payload = {
-        "id": 1,
-        "uploader": 1,
-        "name": "weka.SMO",
-        "version": "1",
-        "external_version": "3.8.6",
-        "description": "SMO classifier",
-        "upload_date": "2020-01-01T00:00:00",
-        "language": "English",
-        "dependencies": "weka==3.8.6",
-        "class_name": "weka.SMO",
-        "custom_name": "weka.SMO",
-    }
-
-    with patch.object(Session, "request") as mock_request:
-        mock_request.return_value = Response()
-        mock_request.return_value.status_code = 200
-        mock_request.return_value._content = b"{}"
-        mock_request.return_value.json = lambda: v2_payload
-
-        flow = flow_v2.get(flow_id=1)
-
+@pytest.mark.test_server()
+def test_flow_v2_get(flow_v2):
+    flow = flow_v2.get(flow_id=1)
     _assert_flow_shape(flow)
 
 
-def test_flow_v2_exists_nonexistent(flow_v2, with_v2_server_config):
+def test_flow_v2_exists_nonexistent(flow_v2):
     with patch.object(Session, "request") as mock_request:
         mock_request.return_value = Response()
         mock_request.return_value.status_code = 200
@@ -223,29 +200,10 @@ def test_flow_v2_publish_not_supported(flow_v2):
         flow_v2.publish(path="flow", files={"description": "<flow/>"})
 
 
-def test_flow_v1_v2_get_output_match(flow_v1, flow_v2, with_v2_server_config):
+@pytest.mark.test_server()
+def test_flow_v1_v2_get_output_match(flow_v1, flow_v2):
     flow_from_v1 = flow_v1.get(flow_id=1)
-
-    v2_payload = {
-        "id": flow_from_v1.flow_id,
-        "uploader": flow_from_v1.uploader,
-        "name": flow_from_v1.name,
-        "version": flow_from_v1.version,
-        "external_version": flow_from_v1.external_version,
-        "description": flow_from_v1.description,
-        "upload_date": "2020-01-01T00:00:00",
-        "language": flow_from_v1.language,
-        "dependencies": flow_from_v1.dependencies,
-        "class_name": flow_from_v1.class_name,
-        "custom_name": flow_from_v1.custom_name,
-    }
-
-    with patch.object(Session, "request") as mock_request:
-        mock_request.return_value = Response()
-        mock_request.return_value.status_code = 200
-        mock_request.return_value._content = b"{}"
-        mock_request.return_value.json = lambda: v2_payload
-        flow_from_v2 = flow_v2.get(flow_id=1)
+    flow_from_v2 = flow_v2.get(flow_id=1)
 
     assert flow_from_v1.flow_id == flow_from_v2.flow_id
     assert flow_from_v1.name == flow_from_v2.name

tests/test_flows/test_flow.py

@@ -106,35 +106,21 @@ def test_get_structure(self):
 
     @pytest.mark.test_server()
     def test_tagging(self):
-        flow_id = openml.flows.flow_exists("weka.ZeroR", "Weka_3.9.0_12024")
-        if not flow_id:
-            pytest.skip("No stable flow available for tagging test on configured test server")
+        flows = openml.flows.list_flows(size=1)
+        flow_id = flows["id"].iloc[0]
         flow = openml.flows.get_flow(flow_id)
         # tags can be at most 64 alphanumeric (+ underscore) chars
-        unique_indicator = uuid.uuid4().hex[:16]
+        unique_indicator = str(time.time()).replace(".", "")
         tag = f"test_tag_TestFlow_{unique_indicator}"
         flows = openml.flows.list_flows(tag=tag)
-        if len(flows) != 0:
-            pytest.skip("Tag filter returned stale/non-empty results for a unique tag")
-        try:
-            flow.push_tag(tag)
-        except openml.exceptions.OpenMLServerException as e:
-            if e.code == 105 and "document missing" in e.message.lower():
-                pytest.skip("Test server index is inconsistent for flow tagging")
-            raise
+        assert len(flows) == 0
+        flow.push_tag(tag)
         flows = openml.flows.list_flows(tag=tag)
-        if len(flows) == 0:
-            pytest.skip("Tag index not updated yet on test server")
+        assert len(flows) == 1
         assert flow_id in flows["id"].values
-        try:
-            flow.remove_tag(tag)
-        except openml.exceptions.OpenMLServerException as e:
-            if e.code == 105 and "document missing" in e.message.lower():
-                pytest.skip("Test server index is inconsistent for flow untagging")
-            raise
+        flow.remove_tag(tag)
         flows = openml.flows.list_flows(tag=tag)
-        if len(flows) != 0 and flow_id in flows["id"].values:
-            pytest.skip("Tag removal not reflected yet by test server index")
+        assert len(flows) == 0
 
     @pytest.mark.test_server()
     def test_from_xml_to_xml(self):
@@ -321,19 +307,21 @@ def test_semi_legal_flow(self):
     def test_publish_error(self, mock_request, flow_exists_mock, get_flow_mock):
         model = sklearn.ensemble.RandomForestClassifier()
         flow = self.extension.model_to_flow(model)
-        
+
         # Create mock response directly
         response = requests.Response()
         response.status_code = 200
         response._content = (
-            "<oml:upload_flow>\n" "    <oml:id>1</oml:id>\n" "</oml:upload_flow>"
+            '<oml:upload_flow xmlns:oml="http://openml.org/openml">\n'
+            "    <oml:id>1</oml:id>\n"
+            "</oml:upload_flow>"
         ).encode()
         mock_request.return_value = response
         flow_exists_mock.return_value = False  # Flow doesn't exist yet, so try to publish
         get_flow_mock.return_value = flow
 
         flow.publish()
-        # Not collecting flow_id for deletion since this is a test for failed upload
+        # The first publish succeeds, so we don't collect flow_id for deletion since this is a mocked test.
 
         assert mock_request.call_count == 1
         assert get_flow_mock.call_count == 1