oscar-python 1.3.2__py3-none-any.whl → 1.3.3__py3-none-any.whl

oscar_python/_oidc.py

@@ -77,14 +77,14 @@ class OIDC(object):
             return True
 
     @staticmethod
-    def refresh_access_token(refresh_token, scopes, token_endpoint):
+    def refresh_access_token(refresh_token, scopes, token_endpoint, client_id="token-portal"):
         """
         Refresh the access token using the refresh token
         """
         data = {
             'grant_type': 'refresh_token',
             'refresh_token': refresh_token,
-            'client_id': 'token-portal',
+            'client_id': client_id,
             'scope': ' '.join(scopes)
         }
 

oscar_python/client.py

@@ -41,6 +41,7 @@ _DELETE = "delete"
 # Default values for OIDC refresh token using EGI CheckIn
 _DEFAULT_SCOPES = ['openid', 'email', 'profile', 'voperson_id', 'eduperson_entitlement']
 _DEFAULT_TOKEN_ENDPOINT = 'https://aai.egi.eu/auth/realms/egi/protocol/openid-connect/token'
+_DEFAULT_CLIENT_ID = 'token-portal'
 
 
 class Client(DefaultClient):
@@ -72,6 +73,8 @@ class Client(DefaultClient):
         self.token_endpoint = options.get('token_endpoint',
                                           _DEFAULT_TOKEN_ENDPOINT)
         self.ssl = bool(options['ssl'])
+        self.client_id = options.get('client_id',
+                                     _DEFAULT_CLIENT_ID)
 
     def set_auth_type(self, options):
         if 'user' in options:
@@ -91,7 +94,8 @@ class Client(DefaultClient):
         if self.refresh_token and OIDC.is_access_token_expired(self.oidc_token):
             self.oidc_token = OIDC.refresh_access_token(self.refresh_token,
                                                         self.scopes,
-                                                        self.token_endpoint)
+                                                        self.token_endpoint,
+                                                        self.client_id)
         return self.oidc_token
 
     """ Creates a generic storage client to interact with the storage providers
@@ -132,9 +136,14 @@ class Client(DefaultClient):
                     except KeyError as err:
                         raise Exception("FDL clusterID does not match current clusterID: {0}".format(err))
                     try:
-                        with open(svc["script"]) as s:
+                        if os.path.isabs(svc["script"]):
+                            script_path =  svc["script"]
+                        else:
+                            fdl_directory = os.path.dirname(fdl_path)
+                            script_path = os.path.join(fdl_directory, svc['script'])
+                        with open(script_path) as s:
                             svc["script"] = s.read()
-                    except IOError:
+                    except IOError  as e:
                         raise Exception("Couldn't read script")
 
                     # cpu parameter has to be string on the request
@@ -205,8 +214,8 @@ class Client(DefaultClient):
         return utils.make_request(self, _LOGS_PATH+"/"+svc+"/"+job, _GET)
 
     """ List a service jobs """
-    def list_jobs(self, svc):
-        return utils.make_request(self, _LOGS_PATH+"/"+svc, _GET)
+    def list_jobs(self, svc, page=""):
+        return utils.make_request(self, _LOGS_PATH+"/"+svc+"?page="+page, _GET)
 
     """ Remove a service job """
     def remove_job(self, svc, job):

{oscar_python-1.3.2.dist-info → oscar_python-1.3.3.dist-info}/METADATA

@@ -1,37 +1,30 @@
 Metadata-Version: 2.4
-Name: oscar_python
-Version: 1.3.2
-Summary: OSCAR API for python
-Home-page: https://github.com/grycap/oscar_python
-Author: GRyCAP - Universitat Politecnica de Valencia
-Author-email: calarcon@i3m.upv.es
-License: Apache 2.0
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
+Name: oscar-python
+Version: 1.3.3
+Summary: Python client for OSCAR clusters
+Author: GRyCAP - I3M - UPV
+License: Apache-2.0
+Project-URL: Homepage, https://github.com/grycap/oscar-python
+Project-URL: Repository, https://github.com/grycap/oscar-python
+Keywords: oscar,faas,serverless
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: webdavclient3==3.14.6
 Requires-Dist: requests
+Requires-Dist: webdavclient3>=3.14.6
 Requires-Dist: boto3
-Requires-Dist: setuptools>=40.8.0
 Requires-Dist: pyyaml
 Requires-Dist: aiohttp
 Requires-Dist: liboidcagent
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/release.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
-![PyPI](https://img.shields.io/pypi/v/oscar_python)
+[![Tests](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/grycap/oscar_python/actions/workflows/tests.yaml)
+[![PyPI](https://img.shields.io/pypi/v/oscar-python)](https://pypi.org/project/oscar-python/)
 
 This package provides a client to interact with OSCAR (https://oscar.grycap.net) clusters and services. It is available on Pypi with the name [oscar-python](https://pypi.org/project/oscar-python/).
 
@@ -107,6 +100,7 @@ and `scopes`:
                 'refresh_token':'token',
                 'scopes': ["openid", "profile", "email"],
                 'token_endpoint': "http://issuer.com/token",
+                'client_id': "your_client_id"
                 'ssl':'True'}
                 
   client = Client(options = options_oidc_auth)
@@ -231,6 +225,8 @@ logs = client.get_job_logs("service_name", "job_id") # returns an http response
 ``` python
 # get a list of jobs in a service
 log_list = client.list_jobs("service_name") # returns an http response
+# to get more jobs use the page parameter
+log_list = client.list_jobs("service_name",page="token_to_next_page") # returns an http response
 ```
 
 **remove_job**

oscar_python-1.3.3.dist-info/RECORD

@@ -0,0 +1,18 @@
+oscar_python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oscar_python/_oidc.py,sha256=0JqOuASAnyOVWKxqIWFN9jFZgYY4p-rZwa8Lq3JWfNk,2611
+oscar_python/_utils.py,sha256=e6DJA_Vziy-3xt_-MEOg_7CM2mNIJNqCaFKD79Spug4,3707
+oscar_python/client.py,sha256=eM9FaxEVZnqlLa_Z9Hf4Pgqf63UUNT0BqyXb2SSgrcw,8957
+oscar_python/client_anon.py,sha256=glGC0kfb2iTTcdFhY5oBtQT7l4OriZfSkswQ3icS_YM,311
+oscar_python/default_client.py,sha256=jjIoZ_BkIkCchlTiUoWddEz6UhCFOEVZMCYcSh-E_y8,1154
+oscar_python/local_test.py,sha256=0i_vGn-N735pvx1JcG4GmjpNmqwXmx5LExVELtW5ECs,251
+oscar_python/storage.py,sha256=BVQ7NHqY5OT2WBXqGTsshCX9b0FNqc0SqMoawvsWxiI,3976
+oscar_python/_providers/_minio.py,sha256=k74Xh11Gk6xkKhIMq3jY-4Xq-jpxiZSMc2RLS6WUuq0,1267
+oscar_python/_providers/_onedata.py,sha256=wKxSAO77ipy8Wm-sybqPo_l2BZYg0cj9B53Ebc92kFs,3469
+oscar_python/_providers/_providers_base.py,sha256=Wmse3xheb1UQRulF2IdtJkq2w96l21anQVAA2ChI63Y,1202
+oscar_python/_providers/_s3.py,sha256=kVK6GhkCqRDvUOzopsRFgt9ZS-KK2ugjPRqJYJG9MO8,3260
+oscar_python/_providers/_webdav.py,sha256=Nt0w87L9K6iGLoMOgHoSfiZpjOd1eYkvuJ8Kopf2IQU,2332
+oscar_python-1.3.3.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+oscar_python-1.3.3.dist-info/METADATA,sha256=efgJdP09L39GOldIBgrG9xnsn70XU0mn4DP_DptFhiE,9612
+oscar_python-1.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oscar_python-1.3.3.dist-info/top_level.txt,sha256=0sLOepeO4vz_8o3vBJyTRRvgJN1TFF1T3SESlIwoJQk,13
+oscar_python-1.3.3.dist-info/RECORD,,

oscar_python-1.3.3.dist-info/top_level.txt

@@ -0,0 +1 @@
+oscar_python

oscar_python-1.3.2.dist-info/RECORD

@@ -1,26 +0,0 @@
-oscar_python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oscar_python/_oidc.py,sha256=Rhsw0ywfkZvDOElMOK8DOBfBkA2H_NmbBn5_0bQoo34,2590
-oscar_python/_utils.py,sha256=e6DJA_Vziy-3xt_-MEOg_7CM2mNIJNqCaFKD79Spug4,3707
-oscar_python/client.py,sha256=3W55myFdqaMZ9zQVfj3iOcw8QUVzXxvWImsMN7-RLAQ,8416
-oscar_python/client_anon.py,sha256=glGC0kfb2iTTcdFhY5oBtQT7l4OriZfSkswQ3icS_YM,311
-oscar_python/default_client.py,sha256=jjIoZ_BkIkCchlTiUoWddEz6UhCFOEVZMCYcSh-E_y8,1154
-oscar_python/local_test.py,sha256=0i_vGn-N735pvx1JcG4GmjpNmqwXmx5LExVELtW5ECs,251
-oscar_python/storage.py,sha256=BVQ7NHqY5OT2WBXqGTsshCX9b0FNqc0SqMoawvsWxiI,3976
-oscar_python/_providers/_minio.py,sha256=k74Xh11Gk6xkKhIMq3jY-4Xq-jpxiZSMc2RLS6WUuq0,1267
-oscar_python/_providers/_onedata.py,sha256=wKxSAO77ipy8Wm-sybqPo_l2BZYg0cj9B53Ebc92kFs,3469
-oscar_python/_providers/_providers_base.py,sha256=Wmse3xheb1UQRulF2IdtJkq2w96l21anQVAA2ChI63Y,1202
-oscar_python/_providers/_s3.py,sha256=kVK6GhkCqRDvUOzopsRFgt9ZS-KK2ugjPRqJYJG9MO8,3260
-oscar_python/_providers/_webdav.py,sha256=Nt0w87L9K6iGLoMOgHoSfiZpjOd1eYkvuJ8Kopf2IQU,2332
-oscar_python-1.3.2.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-tests/test_client.py,sha256=arhLqBVCWVfbVAKaNY3mavAz0hW16odmqY8QI8SyX5o,5097
-tests/test_default_client.py,sha256=hXWUHS1UI-GWTtK1D6lA8xW8TpgUhzlIbP4mOhiyY-o,2606
-tests/test_oidc.py,sha256=SBeKfXHH_Rej1I1xt6Tripy7GALPVohqnb03PMTRPYs,1641
-tests/test_onedata.py,sha256=XwAQ6GCMHecM8ak8XMjkM5X9JTlajrvQXHsy6-eMYOM,2586
-tests/test_s3.py,sha256=M-PsoGtc006is8dTXWVl7Q2rOJ6ZroMBE6EO49gLdXA,1882
-tests/test_storage.py,sha256=JaD-Vs1nJVN7FH4jljvsogWaGmO2MoQn6Xza7PoyhEg,1879
-tests/test_utils.py,sha256=RfzBpmc0HhLklLUs9ukZx7bStHlL0JBYn3q9i5mJHQM,3307
-tests/test_webdav.py,sha256=Vv0y2CrXAt8z73lgpmC81Vib16qlguGgwTxB9JEcq14,1568
-oscar_python-1.3.2.dist-info/METADATA,sha256=dV_lqMzrc-MhM8BkvtAs2vEZnavMqEsEfdMRDZwwgsM,9525
-oscar_python-1.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oscar_python-1.3.2.dist-info/top_level.txt,sha256=JlQqH-wbX-NZn0xlDIEZUOMjymNz_9fHfC4goTMZaPY,35
-oscar_python-1.3.2.dist-info/RECORD,,

oscar_python-1.3.2.dist-info/top_level.txt

@@ -1,3 +0,0 @@
-jupyter_example
-oscar_python
-tests

tests/test_client.py

@@ -1,138 +0,0 @@
-import pytest
-import json
-from unittest.mock import patch, mock_open
-from oscar_python.client import Client
-
-
-@pytest.fixture
-def options():
-    return {
-        'cluster_id': 'test_cluster',
-        'endpoint': 'http://test.endpoint',
-        'user': 'test_user',
-        'password': 'test_password',
-        'ssl': True,
-        'shortname': 'test_shortname',
-        'oidc_token': 'test_oidc_token'
-    }
-
-
-def test_basic_auth_client(options):
-    client = Client(options)
-    assert client.id == options['cluster_id']
-    assert client.endpoint == options['endpoint']
-    assert client.user == options['user']
-    assert client.password == options['password']
-    assert client.ssl == options['ssl']
-
-
-def test_oidc_agent_client(options):
-    del options['user']
-    client = Client(options)
-    assert client.id == options['cluster_id']
-    assert client.endpoint == options['endpoint']
-    assert client.shortname == options['shortname']
-    assert client.ssl == options['ssl']
-
-
-def test_oidc_client(options):
-    del options['user']
-    del options['shortname']
-    client = Client(options)
-    assert client.id == options['cluster_id']
-    assert client.endpoint == options['endpoint']
-    assert client.oidc_token == options['oidc_token']
-    assert client.ssl == options['ssl']
-
-    del options['oidc_token']
-    options['refresh_token'] = 'test_refresh_token'
-    options['scopes'] = ['openid', 'profile', 'email']
-    options['token_endpoint'] = 'test_token_endpoint'
-    client = Client(options)
-    assert client.refresh_token == options['refresh_token']
-    assert client.scopes == ['openid', 'profile', 'email']
-    assert client.token_endpoint == options['token_endpoint']
-
-
-def test_set_auth_type(options):
-    client = Client(options)
-    assert client._AUTH_TYPE == "basicauth"
-
-    del options['user']
-    client = Client(options)
-    assert client._AUTH_TYPE == "oidc-agent"
-
-    del options['shortname']
-    options['oidc_token'] = 'test_oidc_token'
-    client = Client(options)
-    assert client._AUTH_TYPE == "oidc"
-
-
-def test_get_cluster_info(options):
-    client = Client(options)
-    with patch('oscar_python._utils.make_request') as mock_request:
-        client.get_cluster_info()
-        mock_request.assert_called_once_with(client, "/system/info", "get")
-
-
-def test_get_cluster_config(options):
-    client = Client(options)
-    with patch('oscar_python._utils.make_request') as mock_request:
-        client.get_cluster_config()
-        mock_request.assert_called_once_with(client, "/system/config", "get")
-
-
-def test_list_services(options):
-    client = Client(options)
-    with patch('oscar_python._utils.make_request') as mock_request:
-        client.list_services()
-        mock_request.assert_called_once_with(client, "/system/services", "get")
-
-
-def test_get_service(options):
-    client = Client(options)
-    with patch('oscar_python._utils.make_request') as mock_request:
-        client.get_service("test_service")
-        mock_request.assert_called_once_with(client, "/system/services/test_service", "get")
-
-
-def test_create_service_from_dict(options):
-    client = Client(options)
-    service_definition = {"name": "test_service"}
-    with patch('oscar_python._utils.make_request') as mock_request:
-        client.create_service(service_definition)
-        mock_request.assert_called_with(client, "/system/services", "post",
-                                        data=json.dumps(service_definition))
-
-
-def test_create_service_from_file(options):
-    client = Client(options)
-    service_definition = "functions:\n  oscar:\n    - test_cluster:\n        name: test_service\n        script: test_script\n        cpu: 1"
-    service_file = "path/to/service.yaml"
-    with patch('os.path.isfile', return_value=True), \
-         patch('builtins.open', mock_open(read_data=service_definition)), \
-         patch('oscar_python._utils.make_request') as mock_request:
-        client.create_service(service_file)
-        assert mock_request.call_args[0][0] == client
-        assert mock_request.call_args[0][1] == "/system/services"
-        assert mock_request.call_args[0][2] == "post"
-        assert json.loads(mock_request.call_args[1]['data']) == {"name": "test_service",
-                                                                 "cpu": "1",
-                                                                 "script": service_definition}
-
-
-def test_update_service_from_dict(options):
-    client = Client(options)
-    new_service = {"name": "test_service"}
-    with patch('oscar_python._utils.make_request') as mock_request:
-        mock_request.return_value.status_code = 200
-        client.update_service("test_service", new_service)
-        mock_request.assert_called_with(client, "/system/services",
-                                        "put", data=json.dumps(new_service))
-
-
-def test_remove_service(options):
-    client = Client(options)
-    with patch('oscar_python._utils.make_request') as mock_request:
-        client.remove_service("test_service")
-        mock_request.assert_called_once_with(client, "/system/services/test_service", "delete")

tests/test_default_client.py

@@ -1,61 +0,0 @@
-import pytest
-from unittest.mock import patch, MagicMock
-from oscar_python.default_client import DefaultClient, _RUN_PATH, _POST, _JOB_PATH
-
-
-class TestDefaultClient(DefaultClient):
-    def _get_token(self, name):
-        return "test_token"
-
-
-@pytest.fixture
-def client():
-    return TestDefaultClient()
-
-
-@patch('oscar_python._utils.make_request')
-@patch('oscar_python._utils.encode_input')
-@patch('oscar_python._utils.decode_output')
-def test_run_service_with_input_and_token(mock_decode_output, mock_encode_input, mock_make_request, client):
-    mock_response = MagicMock()
-    mock_response.text = "response_text"
-    mock_make_request.return_value = mock_response
-    mock_encode_input.return_value = "encoded_input"
-
-    response = client.run_service("test_service", input="test_input", token="test_token", output="output_file", timeout=30)
-
-    mock_encode_input.assert_called_once_with("test_input")
-    mock_make_request.assert_called_once_with(client, _RUN_PATH+"/test_service", _POST, data="encoded_input", token="test_token", timeout=30)
-    mock_decode_output.assert_called_once_with("response_text", "output_file")
-    assert response == mock_response
-
-
-@patch('oscar_python._utils.make_request')
-@patch('oscar_python._utils.encode_input')
-def test_run_service_with_input_no_token(mock_encode_input, mock_make_request, client):
-    mock_response = MagicMock()
-    mock_response.text = "response_text"
-    mock_make_request.return_value = mock_response
-    mock_encode_input.return_value = "encoded_input"
-
-    response = client.run_service("test_service", input="test_input")
-
-    mock_encode_input.assert_called_once_with("test_input")
-    mock_make_request.assert_called_once_with(client, _RUN_PATH+"/test_service", _POST, data="encoded_input", token="test_token", timeout=None)
-    assert response == mock_response
-
-
-@patch('oscar_python._utils.make_request')
-def test_run_service_no_input(mock_make_request, client):
-    mock_response = MagicMock()
-    mock_response.text = "response_text"
-    mock_make_request.return_value = mock_response
-
-    response = client.run_service("test_service", input="data")
-    mock_make_request.assert_called_with(client, _RUN_PATH+"/test_service", _POST,
-                                         token="test_token", data=b'ZGF0YQ==', timeout=None)
-
-    response = client.run_service("test_service", input="data", async_call=True, timeout=30)
-    mock_make_request.assert_called_with(client, _JOB_PATH+"/test_service", _POST,
-                                         token="test_token", data=b'ZGF0YQ==', timeout=30)
-    assert response == mock_response

tests/test_oidc.py

@@ -1,38 +0,0 @@
-from unittest.mock import patch, MagicMock
-from oscar_python._oidc import OIDC
-
-
-def test_is_access_token_expired():
-    token = ("eyJraWQiOiJyc2ExIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJkYzVkNWFiNy02ZGI5LTQwNzktOTg1Yy04MGFjMDUwMTcw"
-             "NjYiLCJpc3MiOiJodHRwczpcL1wvaWFtLXRlc3QuaW5kaWdvLWRhdGFjbG91ZC5ldVwvIiwiZXhwIjoxNDY2MDkzOTE3LCJ"
-             "pYXQiOjE0NjYwOTAzMTcsImp0aSI6IjE1OTU2N2U2LTdiYzItNDUzOC1hYzNhLWJjNGU5MmE1NjlhMCJ9.eINKxJa2J--xd"
-             "GAZWIOKtx9Wi0Vz3xHzaSJWWY-UHWy044TQ5xYtt0VTvmY5Af-ngwAMGfyaqAAvNn1VEP-_fMYQZdwMqcXLsND4KkDi1ygiC"
-             "IwQ3JBz9azBT1o_oAHE5BsPsE2BjfDoVRasZxxW5UoXCmBslonYd8HK2tUVjz0")
-    assert OIDC.is_access_token_expired(token)
-
-
-def test_refresh_access_token():
-    mock_response = MagicMock()
-    mock_response.status_code = 200
-    mock_response.json.return_value = {
-        "access_token": "new_access_token",
-        "expires_in": 3600,
-        "refresh_token": "new_refresh_token"
-    }
-
-    with patch("requests.post") as mock_post:
-        mock_post.return_value = mock_response
-        access_token = OIDC.refresh_access_token("old_refresh_token",
-                                                 ["openid", "profile", "email"],
-                                                 "http://test.com/token")
-
-        assert access_token == "new_access_token"
-        mock_post.assert_called_once_with(
-            "http://test.com/token",
-            data={
-                "grant_type": "refresh_token",
-                "refresh_token": "old_refresh_token",
-                "client_id": "token-portal",
-                "scope": "openid profile email"
-            }
-        )

tests/test_onedata.py

@@ -1,66 +0,0 @@
-import pytest
-from oscar_python._providers._onedata import Onedata
-from unittest.mock import MagicMock, patch, mock_open
-
-
-@pytest.fixture
-def onedata():
-    credentials = {
-        "token": "token",
-        "space": "space",
-        "oneprovider_host": "oneprovider_host"
-    }
-    return Onedata(credentials)
-
-
-def test_onedata_initialization(onedata):
-    assert isinstance(onedata, Onedata)
-
-
-@patch('oscar_python._providers._onedata.requests')
-def test_onedata_upload_file(mock_requests, onedata):
-    mock_response = MagicMock()
-    mock_response.status_code = 201
-    mock_requests.put.return_value = mock_response
-    with patch("builtins.open", mock_open()):
-        response = onedata.upload_file('file_path', 'remote_path')
-        assert response is None
-    mock_requests.get.assert_called_with(
-        url='https://oneprovider_host/cdmi/space//remote_path/',
-        headers={'X-CDMI-Specification-Version': '1.1.1', 'X-Auth-Token': 'token'}
-    )
-    mock_requests.put.call_args_list[0][1]['url'] == 'https://oneprovider_host/cdmi/space//remote_path/file_path'
-    mock_requests.put.call_args_list[0][1]['headers'] == {'X-Auth-Token', 'token'}
-
-    mock_requests.put.call_args_list[1][0] == 'https://oneprovider_host/cdmi/space//remote_path/file_path'
-    mock_requests.put.call_args_list[1][1]['headers'] == {'X-Auth-Token', 'token'}
-
-
-@patch('oscar_python._providers._onedata.requests')
-def test_onedata_download_file(mock_requests, onedata):
-    mock_response = MagicMock()
-    mock_response.status_code = 200
-    mock_response.content = b'content'
-    mock_requests.get.return_value = mock_response
-    with patch("builtins.open", mock_open()) as mock_file:
-        onedata.download_file('local_path', 'remote_path')
-        mock_file.assert_called_with('local_path/remote_path', 'wb')
-        mock_file().write.assert_called_with(b'content')
-    mock_requests.get.assert_called_with(
-        url='https://oneprovider_host/cdmi/space/remote_path',
-        headers={'X-Auth-Token': 'token'}
-    )
-    mock_requests.get.return_value.content == b'content'
-
-
-@patch('oscar_python._providers._onedata.requests')
-def test_onedata_list_files_from_path(mock_requests, onedata):
-    mock_response = MagicMock()
-    mock_response.status_code = 200
-    mock_requests.get.return_value = mock_response
-    response = onedata.list_files_from_path('path')
-    assert response == mock_response
-    mock_requests.get.assert_called_with(
-        url='https://oneprovider_host/cdmi/space/path/',
-        headers={'X-CDMI-Specification-Version': '1.1.1', 'X-Auth-Token': 'token'}
-    )

tests/test_s3.py

@@ -1,48 +0,0 @@
-import pytest
-from oscar_python._providers._s3 import S3
-from unittest.mock import MagicMock, patch, mock_open
-
-
-@pytest.fixture
-def s3_client():
-    credentials = {
-        "access_key": "access_key",
-        "secret_key": "secret_key",
-        "region": "region"
-    }
-    return S3(credentials)
-
-
-def test_s3_initialization(s3_client):
-    assert s3_client is not None
-
-
-def test_s3_upload_file(s3_client):
-    s3_client.client = MagicMock(["upload_fileobj"])
-    with patch("builtins.open", mock_open(read_data="data")) as mock_file:
-        result = s3_client.upload_file('path/file.txt', 'test_bucket/folder')
-        mock_file.assert_called_once_with("path/file.txt", "rb")
-        s3_client.client.upload_fileobj.assert_called_once()
-        s3_client.client.upload_fileobj.call_args[0][1] == 'test_bucket'
-        s3_client.client.upload_fileobj.call_args[0][2] == 'folder/file.txt'
-    assert result is True
-
-
-def test_s3_download_file(s3_client):
-    s3_client.client = MagicMock(["download_fileobj"])
-    with patch("builtins.open", mock_open()) as mock_file:
-        result = s3_client.download_file('path/folder', 'test_bucket/file.txt')
-        mock_file.assert_called_once_with("path/folder/file.txt", "wb")
-        s3_client.client.download_fileobj.assert_called_once()
-        s3_client.client.download_fileobj.call_args[0][1] == 'test_bucket'
-        s3_client.client.download_fileobj.call_args[0][2] == 'folder/file.txt'
-    assert result is True
-
-
-def test_s3_list_files(s3_client):
-    s3_client.client = MagicMock(["list_objects"])
-    s3_client.client.list_objects.return_value = ['file1', 'file2']
-    result = s3_client.list_files_from_path('test_bucket/*.txt')
-    assert result == ['file1', 'file2']
-    s3_client.client.list_objects.assert_called_once_with(Bucket='test_bucket',
-                                                          Prefix='*.txt')

tests/test_storage.py

@@ -1,51 +0,0 @@
-import pytest
-from unittest.mock import MagicMock, patch
-from oscar_python.storage import Storage
-
-
-@pytest.fixture
-def mock_client_obj():
-    return MagicMock()
-
-
-@pytest.fixture
-def storage(mock_client_obj):
-    mock_response = MagicMock()
-    mock_response.text = '{"minio_provider": {"access_key": "key","secret_key": "secret", "endpoint": "http://test.endpoint", "region": "us-east-1", "verify": false}}'
-    with patch('oscar_python._utils.make_request', return_value=mock_response):
-        return Storage(mock_client_obj)
-
-
-def test_get_provider_creds(storage):
-    creds = storage._get_provider_creds("minio", "default")
-    assert creds["access_key"] == "key"
-    assert creds["secret_key"] == "secret"
-
-
-def test_get_client_minio(storage):
-    client = storage._get_client("minio.default")
-    assert client.__class__.__name__ == "Minio"
-
-
-def test_list_files_from_path(storage):
-    with patch.object(storage, '_get_client') as mock_get_client:
-        mock_client = MagicMock()
-        mock_get_client.return_value = mock_client
-        storage.list_files_from_path("minio.default", "/path")
-        mock_client.list_files_from_path.assert_called_once_with("/path")
-
-
-def test_upload_file(storage):
-    with patch.object(storage, '_get_client') as mock_get_client:
-        mock_client = MagicMock()
-        mock_get_client.return_value = mock_client
-        storage.upload_file("minio.default", "/local/path", "/remote/path")
-        mock_client.upload_file.assert_called_once_with("/local/path", "/remote/path")
-
-
-def test_download_file(storage):
-    with patch.object(storage, '_get_client') as mock_get_client:
-        mock_client = MagicMock()
-        mock_get_client.return_value = mock_client
-        storage.download_file("minio.default", "/local/path", "/remote/path")
-        mock_client.download_file.assert_called_once_with("/local/path", "/remote/path")

tests/test_utils.py

@@ -1,96 +0,0 @@
-import base64
-from unittest.mock import patch, MagicMock, mock_open
-
-import oscar_python._utils as utils
-
-
-def test_get_headers_with_basicauth():
-    class MockClient:
-        _AUTH_TYPE = "basicauth"
-        user = "test_user"
-        password = "test_password"
-
-    c = MockClient()
-    headers = utils.get_headers(c)
-    assert headers["Authorization"].startswith("Basic ")
-
-
-def test_get_headers_with_oidc_agent():
-    class MockClient:
-        _AUTH_TYPE = "oidc-agent"
-        shortname = "test_shortname"
-
-    with patch("liboidcagent.get_access_token", return_value="test_token"):
-        c = MockClient()
-        headers = utils.get_headers(c)
-        assert headers["Authorization"] == "Bearer test_token"
-
-
-def test_get_headers_with_oidc():
-    class MockClient:
-        _AUTH_TYPE = "oidc"
-
-        def get_access_token(self):
-            return "test_oidc_token"
-
-    c = MockClient()
-    headers = utils.get_headers(c)
-    assert headers["Authorization"] == "Bearer test_oidc_token"
-
-
-def test_encode_input_with_string():
-    test_data = "test_data"
-    encoded = utils.encode_input(test_data)
-    assert base64.b64encode(test_data.encode()) == encoded
-
-
-def test_decode_output_with_base64():
-    test_data = base64.b64encode(b"test_data").decode("utf-8")
-    with patch("builtins.open", mock_open()) as mock_file:
-        utils.decode_output(test_data, "test_output.txt")
-        mock_file.assert_called_once_with("test_output.txt", "w")
-        mock_file().write.assert_called_once_with("test_data")
-
-
-def test_decode_output_with_string():
-    test_data = base64.b64encode(b"test_data")
-    with patch("builtins.open", mock_open()) as mock_file:
-        utils.decode_output(test_data, "test_output.txt")
-        mock_file.assert_called_once_with("test_output.txt", "w")
-        mock_file().write.assert_called_once_with("test_data")
-
-
-def test_make_request_post():
-    class MockClient:
-        endpoint = "http://test.com"
-        ssl = True
-        _AUTH_TYPE = "basicauth"
-        user = "test_user"
-        password = "test_password"
-
-    c = MockClient()
-    with patch("requests.request") as mock_request:
-        mock_request.return_value.status_code = 200
-        mock_request.return_value.raise_for_status = MagicMock()
-        response = utils.make_request(c, "/test", "post", data="test_data", token="test_token")
-        assert response.status_code == 200
-        mock_request.assert_called_once_with("post", "http://test.com/test", headers={"Authorization": "Bearer test_token"}, verify=True, data="test_data", timeout=60)
-
-
-def test_make_request_get():
-    class MockClient:
-        endpoint = "http://test.com"
-        ssl = True
-        _AUTH_TYPE = "basicauth"
-        user = "test_user"
-        password = "test_password"
-
-    c = MockClient()
-    with patch("requests.request") as mock_request:
-        mock_request.return_value.status_code = 200
-        mock_request.return_value.raise_for_status = MagicMock()
-        response = utils.make_request(c, "/test", "get")
-        assert response.status_code == 200
-        mock_request.assert_called_once_with("get", "http://test.com/test",
-                                             headers={'Authorization': 'Basic dGVzdF91c2VyOnRlc3RfcGFzc3dvcmQ='},
-                                             verify=True, timeout=60)

tests/test_webdav.py

@@ -1,50 +0,0 @@
-import pytest
-from oscar_python._providers._webdav import WebDav
-from unittest.mock import patch, mock_open, MagicMock
-
-
-@pytest.fixture
-def webdav():
-    credentials = {
-        "hostname": "hostname",
-        "login": "login",
-        "password": "password"
-    }
-    return WebDav(credentials)
-
-
-def test_webdav_initialization(webdav):
-    assert isinstance(webdav, WebDav)
-
-
-def test_webdav_upload_file(webdav):
-    webdav.client = MagicMock(["check", "mkdir", "upload_sync"])
-    webdav.client.check.return_value = False
-
-    with patch("builtins.open", mock_open()):
-        response = webdav.upload_file('local_path/file.txt', 'remote_path')
-        assert response is None
-
-    webdav.client.check.assert_called_with('remote_path')
-    webdav.client.mkdir.assert_called_with('remote_path')
-    webdav.client.upload_sync.assert_called_with('remote_path/file.txt', 'local_path/file.txt')
-
-
-def test_webdav_download_file(webdav):
-    webdav.client = MagicMock(["download_sync"])
-    webdav.client.download_sync.return_value = None
-
-    with patch("builtins.open", mock_open()) as mock_file:
-        webdav.download_file('local_path', 'remote_path/file.txt')
-
-    webdav.client.download_sync.assert_called_with('remote_path/file.txt', 'local_path/file.txt')
-
-
-def test_webdav_list_files_from_path(webdav):
-    webdav.client = MagicMock(["list"])
-    webdav.client.list.return_value = ['file1.txt', 'file2.txt']
-
-    response = webdav.list_files_from_path('path')
-    assert response == ['file1.txt', 'file2.txt']
-
-    webdav.client.list.assert_called_with('path')