oscar-python 1.3.0__tar.gz → 1.3.1__tar.gz

{oscar_python-1.3.0 → oscar_python-1.3.1}/PKG-INFO

@@ -1,35 +1,20 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: oscar_python
-Version: 1.3.0
+Version: 1.3.1
 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
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: webdavclient3==3.14.6
-Requires-Dist: requests
-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
-Dynamic: requires-dist
-Dynamic: summary
 
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/main.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
+[![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)
 
 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/).
@@ -84,6 +69,33 @@ If you already have a valid token, you can use the parameter `oidc_token` instea
 ```
 An example of using a generated token is if you want to use EGI Notebooks. Since you can't use oidc-agent on the Notebook, you can make use of the generated token that EGI provides on path `/var/run/secrets/egi.eu/access_token`.
 
+If you have a valid refresh token (long live token), you can use the parameter `refresh_token` instead.
+
+``` python
+  options_oidc_auth = {'cluster_id':'cluster-id',
+                'endpoint':'https://cluster-endpoint',
+                'refresh_token':'token',
+                'ssl':'True'}
+                
+  client = Client(options = options_oidc_auth)
+```
+
+You can get a refresh token from EGI Check-In using the [Token Portal](https://aai.egi.eu/token).
+
+In case of using other OIDC provider you must provide two additional parameters `token_endpoint`
+and `scopes`:
+
+``` python
+  options_oidc_auth = {'cluster_id':'cluster-id',
+                'endpoint':'https://cluster-endpoint',
+                'refresh_token':'token',
+                'scopes': ["openid", "profile", "email"],
+                'token_endpoint': "http://issuer.com/token",
+                'ssl':'True'}
+                
+  client = Client(options = options_oidc_auth)
+```
+
 ### Sample usage
 
 - Sample code that creates a client and gets information about the cluster
@@ -219,11 +231,19 @@ response = client.remove_all_jobs("service_name") # returns an http response
 
 #### Storage usage
 
-You can create a storage object to operate over the different storage providers defined on a service with the method `create_storage_client` as follows:
+You can create a storage object to operate over the different storage providers defined on a service with the method `create_storage_client`. This constructor returns a storage object with methos to interact with the storage providers.
+
+The default constructor, seen as follows, will create a provider to interact with the default MinIO instance through the user's credentials. 
+
+``` python
+storage_service = client.create_storage_client() # returns a storage object
+```
+Additionally, if you need to interact with specific storage providers defined on a service, the constructor accepts a `svc` parameter where you can state the service name from which to search for additional credentials.
 
 ``` python
 storage_service = client.create_storage_client("service_name") # returns a storage object
 ```
+
 > _Note_ : The `storage_provider` parameter on the storage methods follows the format: `["storage_provider_type"].["storage_provider_name"]` where `storage_provider_type` is one of the suported storage providers (minIO, S3, Onedata or webdav) and `storage_provider_name` is the identifier _(ex: minio.default)_
 
 **list_files_from_path**
@@ -246,3 +266,5 @@ response = storage_service.upload_file("storage_provider", "local_path", "remote
 # download a file from a remote path to a local path 
 response = storage_service.download_file("storage_provider", "local_path", "remote_path")
 ```
+
+

{oscar_python-1.3.0 → oscar_python-1.3.1}/README.md

@@ -1,6 +1,6 @@
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/main.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
+[![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)
 
 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/).
@@ -55,6 +55,33 @@ If you already have a valid token, you can use the parameter `oidc_token` instea
 ```
 An example of using a generated token is if you want to use EGI Notebooks. Since you can't use oidc-agent on the Notebook, you can make use of the generated token that EGI provides on path `/var/run/secrets/egi.eu/access_token`.
 
+If you have a valid refresh token (long live token), you can use the parameter `refresh_token` instead.
+
+``` python
+  options_oidc_auth = {'cluster_id':'cluster-id',
+                'endpoint':'https://cluster-endpoint',
+                'refresh_token':'token',
+                'ssl':'True'}
+                
+  client = Client(options = options_oidc_auth)
+```
+
+You can get a refresh token from EGI Check-In using the [Token Portal](https://aai.egi.eu/token).
+
+In case of using other OIDC provider you must provide two additional parameters `token_endpoint`
+and `scopes`:
+
+``` python
+  options_oidc_auth = {'cluster_id':'cluster-id',
+                'endpoint':'https://cluster-endpoint',
+                'refresh_token':'token',
+                'scopes': ["openid", "profile", "email"],
+                'token_endpoint': "http://issuer.com/token",
+                'ssl':'True'}
+                
+  client = Client(options = options_oidc_auth)
+```
+
 ### Sample usage
 
 - Sample code that creates a client and gets information about the cluster
@@ -190,11 +217,19 @@ response = client.remove_all_jobs("service_name") # returns an http response
 
 #### Storage usage
 
-You can create a storage object to operate over the different storage providers defined on a service with the method `create_storage_client` as follows:
+You can create a storage object to operate over the different storage providers defined on a service with the method `create_storage_client`. This constructor returns a storage object with methos to interact with the storage providers.
+
+The default constructor, seen as follows, will create a provider to interact with the default MinIO instance through the user's credentials. 
+
+``` python
+storage_service = client.create_storage_client() # returns a storage object
+```
+Additionally, if you need to interact with specific storage providers defined on a service, the constructor accepts a `svc` parameter where you can state the service name from which to search for additional credentials.
 
 ``` python
 storage_service = client.create_storage_client("service_name") # returns a storage object
 ```
+
 > _Note_ : The `storage_provider` parameter on the storage methods follows the format: `["storage_provider_type"].["storage_provider_name"]` where `storage_provider_type` is one of the suported storage providers (minIO, S3, Onedata or webdav) and `storage_provider_name` is the identifier _(ex: minio.default)_
 
 **list_files_from_path**

oscar_python-1.3.1/oscar_python/_oidc.py

@@ -0,0 +1,96 @@
+"""
+Class to manage OIDC JWT tokens
+"""
+import json
+import base64
+import re
+import time
+import requests
+
+
+class OIDC(object):
+
+    @staticmethod
+    def _b64d(b):
+        """Decode some base64-encoded bytes.
+
+        Raises Exception if the string contains invalid characters or padding.
+
+        :param b: bytes
+        """
+
+        cb = b.rstrip(b"=")  # shouldn't but there you are
+
+        # Python's base64 functions ignore invalid characters, so we need to
+        # check for them explicitly.
+        b64_re = re.compile(b"^[A-Za-z0-9_-]*$")
+        if not b64_re.match(cb):
+            raise Exception(cb, "base64-encoded data contains illegal characters")
+
+        if cb == b:
+            b = OIDC._add_padding(b)
+
+        return base64.urlsafe_b64decode(b)
+
+    @staticmethod
+    def _add_padding(b):
+        # add padding chars
+        m = len(b) % 4
+        if m == 1:
+            # NOTE: for some reason b64decode raises *TypeError* if the
+            # padding is incorrect.
+            raise Exception(b, "incorrect padding")
+        elif m == 2:
+            b += b"=="
+        elif m == 3:
+            b += b"="
+        return b
+
+    @staticmethod
+    def get_info(token):
+        """
+        Unpacks a JWT into its parts and base64 decodes the parts
+        individually, returning the part 1 json decoded, where the
+        token info is stored.
+
+        :param token: The JWT token
+        """
+        part = tuple(token.encode("utf-8").split(b"."))
+        part = [OIDC._b64d(p) for p in part]
+        return json.loads(part[1].decode("utf-8"))
+
+    @staticmethod
+    def is_access_token_expired(token):
+        """
+        Check if the current access token is expired
+        """
+        try:
+            decoded_token = OIDC.get_info(token)
+            now = int(time.time())
+            expires = int(decoded_token['exp'])
+            validity = expires - now
+            if validity < 0:
+                return True
+            else:
+                return False
+        except Exception:
+            return True
+
+    @staticmethod
+    def refresh_access_token(refresh_token, scopes, token_endpoint):
+        """
+        Refresh the access token using the refresh token
+        """
+        data = {
+            'grant_type': 'refresh_token',
+            'refresh_token': refresh_token,
+            'client_id': 'token-portal',
+            'scope': ' '.join(scopes)
+        }
+
+        response = requests.post(token_endpoint, data=data)
+
+        if response.status_code == 200:
+            return response.json()['access_token']
+        else:
+            return None

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python/_utils.py

@@ -56,7 +56,7 @@ def get_headers(c):
         token = agent.get_access_token(c.shortname)
         return get_headers_with_token(token)
     if c._AUTH_TYPE == "oidc":
-        return get_headers_with_token(c.oidc_token)
+        return get_headers_with_token(c.get_access_token())
 
 
 def get_headers_with_token(token):

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python/client.py

@@ -18,6 +18,7 @@ import os
 import yaml
 import liboidcagent as agent
 import oscar_python._utils as utils
+from oscar_python._oidc import OIDC
 from oscar_python.default_client import DefaultClient
 from oscar_python.storage import Storage
 
@@ -37,10 +38,16 @@ _POST = "post"
 _PUT = "put"
 _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'
+
 
 class Client(DefaultClient):
     # Cluster info
     def __init__(self, options) -> None:
+        self.id = options['cluster_id']
+        self.endpoint = options['endpoint']
         self.set_auth_type(options)
         if self._AUTH_TYPE == 'basicauth':
             self.basic_auth_client(options)
@@ -50,22 +57,20 @@ class Client(DefaultClient):
             self.oidc_client(options)
 
     def basic_auth_client(self, options):
-        self.id = options['cluster_id']
-        self.endpoint = options['endpoint']
         self.user = options['user']
         self.password = options['password']
         self.ssl = bool(options['ssl'])
 
     def oidc_agent_client(self, options):
-        self.id = options['cluster_id']
-        self.endpoint = options['endpoint']
         self.shortname = options['shortname']
         self.ssl = bool(options['ssl'])
 
     def oidc_client(self, options):
-        self.id = options['cluster_id']
-        self.endpoint = options['endpoint']
-        self.oidc_token = options['oidc_token']
+        self.oidc_token = options.get('oidc_token')
+        self.refresh_token = options.get('refresh_token')
+        self.scopes = options.get('scopes', _DEFAULT_SCOPES)
+        self.token_endpoint = options.get('token_endpoint',
+                                          _DEFAULT_TOKEN_ENDPOINT)
         self.ssl = bool(options['ssl'])
 
     def set_auth_type(self, options):
@@ -77,18 +82,28 @@ class Client(DefaultClient):
                 agent.get_access_token(options['shortname'])
             except agent.OidcAgentError as e:
                 print("ERROR oidc-agent: {}".format(e))
-        elif 'oidc_token' in options:
+        elif 'oidc_token' in options or 'refresh_token' in options:
             self._AUTH_TYPE = "oidc"
         else:
             raise ValueError("Unrecognized authentication credentials in options")
 
+    def get_access_token(self):
+        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)
+        return self.oidc_token
+
     """ Creates a generic storage client to interact with the storage providers
     defined on a specific service of the refered OSCAR cluster """
-    def create_storage_client(self, svc):
-        return Storage(
-                client_obj=self,
-                svc_name=svc)
-
+    def create_storage_client(self, svc=None):
+        if svc != None:
+            return Storage(
+                client_obj=self, svc_name=svc)
+        else:
+            return Storage(
+                    client_obj=self)
+        
     """ Function to get cluster info """
     def get_cluster_info(self):
         return utils.make_request(self, _INFO_PATH, _GET)

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python/storage.py

@@ -23,21 +23,37 @@ _MINIO = "minio"
 _S3 = "s3"
 _ONE_DATA = "onedata"
 _WEBDAV = "webdav"
+
+_GET = "get"
+_CONFIG_PATH = "/system/config"
 _SVC_PATH = "/system/services"
 
 
 # TODO check returns from functions
 class Storage:
-    def __init__(self, client_obj, svc_name) -> None:
+    def __init__(self, client_obj, svc_name = None) -> None:
         self.client_obj = client_obj
-        self.svc_name = svc_name
-        self._store_providers()
+        self.storage_providers = {}
+        if svc_name != None:
+            self.svc_name = svc_name
+            self._store_provider_from_service()
+        self._store_default_minio_provider()
 
     """ Function to store all the providers of the service """
-    def _store_providers(self):
-        svc = utils.make_request(self.client_obj, _SVC_PATH + "/" + self.svc_name, "get")
+    def _store_provider_from_service(self):
+        svc = utils.make_request(self.client_obj, _SVC_PATH + "/" + self.svc_name, _GET)
         self.storage_providers = json.loads(svc.text)["storage_providers"]
 
+    """ Function to store the user credentials for the default MinIO provider """
+    def _store_default_minio_provider(self):
+        config = utils.make_request(self.client_obj, _CONFIG_PATH + "/" , _GET)
+        if _MINIO in self.storage_providers:
+            self.storage_providers[_MINIO]["default"] = json.loads(config.text)["minio_provider"]
+        else:
+            default = {"default": json.loads(config.text)["minio_provider"]}
+            self.storage_providers[_MINIO] = default
+        
+
     """ Function to retreive credentials of a specific storage provider """
     def _get_provider_creds(self, provider, provider_name):
         return self.storage_providers[provider][provider_name]

oscar_python-1.3.1/oscar_python/test_v2.py

@@ -0,0 +1,206 @@
+import json
+import base64
+from client import Client
+#from client import Client
+from storage import Storage
+from client_anon import AnonymousClient
+
+
+def get_svc_test(client):
+    response = client.get_service("cowsay")
+    print(response)
+
+def cowsay_test_anon(client):
+    text = {"message": "blyat"}
+    tk = '38919156059e55805f66b81f74e8f6b59e0ba9e1f987900ed0a6eb0eb0aed82e'
+    response = client.run_service("cowsay", token=tk, input=json.dumps(text))
+    print(response.text)
+
+def cowsay_test_text(client):
+    text = "blyat"
+    response = client.run_service("cowsay", input=text)
+    print(response.text)
+
+def plants_test_anon(client):
+    tk = "201d9c9c252a47d70e61dacbf02353074921ddd4a39aaef16440949b604c2e26"
+    image_in = "/home/calarcon/Pictures/plant2.jpg"
+    response = client.run_service("ai4eosc-service", token= tk, input=image_in, timeout=400)
+    print(response)
+
+def text_to_speech_test(client):
+    file_in = "/home/caterina/Documentos/text-to-speech-coqui/text.txt"
+    file_out = "/home/caterina/Documentos/text-to-speech-coqui/test-python-run-out.mp3"
+    response = client.run_service("text-to-speech-coqui", input="si vose volve a desir uwu", output="test-tes-test.mp3", timeout=100)
+    #print(response.text)
+
+def plants_sync_test(client):
+    image_in = "/home/caterina/Documentos/egi_conference_2023/plants_example/images/cerezos.jpg"
+    response = client.run_service("plant-classification", input=image_in, timeout=400)
+
+    
+def grayify_test(client):
+    response = client.run_service("grayify", input="/home/caterina/Documentos/imagemagick_example/images")
+
+def create_service_test(client):
+    path = "/home/caterina/Documentos/imagemagick_example/imagemagick.yaml"
+    return client.create_service(path)
+
+def json_definition_example():
+    return {
+        "name": "grayify",
+        "memory": "1Gi",
+        "cpu": "1.0",
+        "total_memory": "1Gi",
+        "total_cpu": "1.0",
+        "log_level": "CRITICAL",
+        "image": "ghcr.io/grycap/imagemagick",
+        "alpine": True,
+        "script": "#!/bin/bash \necho \'SCRIPT: Invoked Image Grayifier. File available in $INPUT_FILE_PATH\' \nFILE_NAME=`basename \'$INPUT_FILE_PATH\'` \nOUTPUT_FILE=\'$TMP_OUTPUT_DIR/$FILE_NAME\' \necho \'SCRIPT: Converting input image file $INPUT_FILE_PATH to grayscale to output file $OUTPUT_FILE\' \nconvert \'$INPUT_FILE_PATH\' -type Grayscale \'$OUTPUT_FILE\'",
+        "image_pull_secrets": [
+        ],
+        "input": [
+            {
+                "storage_provider": "minio.default",
+                "path": "grayify/input",
+                "suffix": [
+                    ""
+                ],
+                "prefix": [
+                    ""
+                ]
+            }
+        ],
+        "output": [
+            {
+                "storage_provider": "minio.default",
+                "path": "grayify/output",
+                "suffix": [
+                    ""
+                ],
+                "prefix": [
+                    ""
+                ]
+            },
+            {
+                "storage_provider": "webdav.dcache",
+                "path": "/Users/calarcon/grayify",
+                "suffix": [
+                    ""
+                ],
+                "prefix": [
+                    ""
+                ]
+            }
+        ],
+        "storage_providers": {
+            "minio": {
+                "default": {
+                    "endpoint": "http://console.minio.wizardly-lamport0.im.grycap.net",
+                    "region": "us-west-1",
+                    "secret_key": "a1b2c3d4",
+                    "access_key": "minio",
+                    "verify": True
+                }
+            },
+            "webdav": {
+                "dcache": {
+                    "hostname": "prometheus.desy.de",
+                    "login": "calarcon",
+                    "password": "v5vsYhd2"
+                }
+            }
+        }
+    }
+
+def ai4eosc_test(client):
+    service = {
+        "log_level": "CRITICAL",
+        "memory": "1Gi",
+        "cluster_id": "oscar-cluster",
+        "name": "test2",
+        "cpu": "1.0",
+        "vo": "vo.ai4eosc.eu",
+        "image": "deephdc/deep-oc-plants-classification-tf",
+        "alpine": False,
+        "script": "#!/bin/bash",
+        "allowed_users" : []
+    }
+    res = client.create_service(service)
+    print(res.text)
+
+def get_service_base_definition():
+    """
+    Base parameters of an OSCAR service
+
+    """
+    return {
+
+    "log_level": "CRITICAL",
+    "alpine": False,
+    "script": "#!/bin/bash \nFILE_NAME=`basename $INPUT_FILE_PATH` \
+                \nOUTPUT_FILE=\"$TMP_OUTPUT_DIR/$FILE_NAME\"\
+                \necho \"SCRIPT: Invoked deepaas-predict command. File available in $INPUT_FILE_PATH.\" \
+                \deepaas-predict -i $INPUT_FILE_PATH -o $OUTPUT_FILE"
+    }
+
+def main(): 
+     
+    #client.remove_service(svc_name)
+    #local_client = Client("oscar-test","http://localhost", "oscar", "MTY5Yjc0", False)
+
+    # Options for basic auth login
+    options_basic_auth = {'cluster_id':'oscar-egi-cluster',
+                'endpoint':'https://funny-kalam8.im.grycap.net',
+                'user':'oscar',
+                'password':'oscar123',
+                'ssl':'True'}
+    
+    options_egi = {'cluster_id':'oscar-cluster',
+                'endpoint':'https://oscar.test.fedcloud.eu/',
+                'shortname':'calarcon',
+                'ssl':'True'}
+    
+    SERVICE_NAME = "grayify"
+    token = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJQVVlPaXJBM1ktZF9kR3BkajRpSkRIdzR6SGE4SVktYmhaZGFFajByamJVIn0.eyJleHAiOjE3MTY4MDMwMDksImlhdCI6MTcxNjc5OTQwOSwiYXV0aF90aW1lIjoxNzE2Nzk1NDgzLCJqdGkiOiI0OTBmNDdlNy00NTc2LTRjODYtYWUyMy00ZjIxNDUzZDEzMjMiLCJpc3MiOiJodHRwczovL2FhaS5lZ2kuZXUvYXV0aC9yZWFsbXMvZWdpIiwic3ViIjoiNjJiYjExYjQwMzk4ZjczNzc4YjY2ZjM0NGQyODIyNDJkZWJiOGVlM2ViYjEwNjcxN2ExMjNjYTIxMzE2MjkyNkBlZ2kuZXUiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJpbS1kYXNoYm9hcmQiLCJzZXNzaW9uX3N0YXRlIjoiMjhiMjU5OGUtYmQ2YS00Y2UzLWI4MDUtNDgyNWRmNGQ2ZjM0Iiwic2NvcGUiOiJvcGVuaWQgb2ZmbGluZV9hY2Nlc3MgZWR1cGVyc29uX2VudGl0bGVtZW50IHByb2ZpbGUgZW1haWwiLCJzaWQiOiIyOGIyNTk4ZS1iZDZhLTRjZTMtYjgwNS00ODI1ZGY0ZDZmMzQiLCJhdXRoZW50aWNhdGluZ19hdXRob3JpdHkiOiJodHRwczovL3d3dy5yZWRpcmlzLmVzL3Npci91cHZpZHAifQ.aZib2Rypqy-XGjPn4ycmEA4u1nlNUb45zz4ry8yZevAdna3lNzEIvxsfwYpjgAvmiDEzrJMYRNAm2652EgvCPUK4bnn9qJuzPhEfSpRbam_jDxmG9MiX6XlKSIO-UqlJQLuDxAAAGuxhdvfqffaT9rZ10042w6-0qTvSiXtNOvFkusc4iVHp8eBcr469txMFvEcWoV8uPXtTL6bl8rbEQMEo2KT1p9twzVpL1WQNIa0XrVa4pfIS3V_IDCKjcDl8PmV3N7KKKkIiQEFg13FS6TSLEs2peszi8eqSAXX2Lq27eSxl0pPH3ZTcrA7vI5dyTKSi7qoK7lsKtHZJOvOCvw"
+    options_egi_oidc = {'cluster_id':'oscar-egi-oidc',
+            'endpoint':'https://inference.cloud.ai4eosc.eu',
+            'oidc_token': token,
+            'ssl':'True'}
+
+    #client = Client("oscar-cluster","https://sleepy-brown8.im.grycap.net", "oscar", "oscar123", True)
+    anon_client = AnonymousClient({
+                     'cluster_id':'oscar-cluster',
+                     'endpoint':'https://funny-kalam8.im.grycap.net',
+                     'ssl':'true'
+         })
+
+    #get_svc_test(anon_client)
+
+    try:
+         client = Client(options = options_egi)
+         print("Client created!!")
+    except:
+         print("Error creating OSCAR client!!!!11")
+
+    # res = client.run_service(SERVICE_NAME, input="/home/calarcon/Pictures/cat.jpg", output=".")
+    # print(res)
+    storage = client.create_storage_client()
+    print(storage.storage_providers)
+    print("------------------------")
+    storage = client.create_storage_client("grayify")
+    print(storage.storage_providers)
+    #cowsay_test_text(client)
+    #get_svc_test(client)   
+    #grayify_storage = client.create_storage_client(svc_name)
+    #stablediff_storage = client.create_storage_client("stable-diffusion")
+    
+    # Download files test 
+    #res = stablediff_storage.download_file("minio.default", "/home/caterina/Documentos/oscar_python_package", "stable-diffusion/out/text1.zip")
+    #res = grayify_storage.download_file("minio.default", "/home/caterina/Documentos/oscar_python_package", "gray/output/image1.jpg")
+    
+    # Upload files test 
+    #res = stablediff_storage.upload_file("minio.default", "/home/caterina/Documentos/txt_to_img/text1.txt", "stable-diffusion/in")
+    #res = grayify_storage.upload_file("minio.default", "/home/caterina/Documentos/imagemagick_example/images/image2.jpeg", "gray/input")
+
+if __name__ == "__main__":
+    main()

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python.egg-info/PKG-INFO

@@ -1,35 +1,20 @@
-Metadata-Version: 2.2
-Name: oscar_python
-Version: 1.3.0
+Metadata-Version: 2.1
+Name: oscar-python
+Version: 1.3.1
 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
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: webdavclient3==3.14.6
-Requires-Dist: requests
-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
-Dynamic: requires-dist
-Dynamic: summary
 
 ## Python OSCAR client
 
-[![Build](https://github.com/grycap/oscar_python/actions/workflows/main.yaml/badge.svg)](https://github.com/grycap/oscar_python/actions/workflows/main.yaml)
+[![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)
 
 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/).
@@ -84,6 +69,33 @@ If you already have a valid token, you can use the parameter `oidc_token` instea
 ```
 An example of using a generated token is if you want to use EGI Notebooks. Since you can't use oidc-agent on the Notebook, you can make use of the generated token that EGI provides on path `/var/run/secrets/egi.eu/access_token`.
 
+If you have a valid refresh token (long live token), you can use the parameter `refresh_token` instead.
+
+``` python
+  options_oidc_auth = {'cluster_id':'cluster-id',
+                'endpoint':'https://cluster-endpoint',
+                'refresh_token':'token',
+                'ssl':'True'}
+                
+  client = Client(options = options_oidc_auth)
+```
+
+You can get a refresh token from EGI Check-In using the [Token Portal](https://aai.egi.eu/token).
+
+In case of using other OIDC provider you must provide two additional parameters `token_endpoint`
+and `scopes`:
+
+``` python
+  options_oidc_auth = {'cluster_id':'cluster-id',
+                'endpoint':'https://cluster-endpoint',
+                'refresh_token':'token',
+                'scopes': ["openid", "profile", "email"],
+                'token_endpoint': "http://issuer.com/token",
+                'ssl':'True'}
+                
+  client = Client(options = options_oidc_auth)
+```
+
 ### Sample usage
 
 - Sample code that creates a client and gets information about the cluster
@@ -219,11 +231,19 @@ response = client.remove_all_jobs("service_name") # returns an http response
 
 #### Storage usage
 
-You can create a storage object to operate over the different storage providers defined on a service with the method `create_storage_client` as follows:
+You can create a storage object to operate over the different storage providers defined on a service with the method `create_storage_client`. This constructor returns a storage object with methos to interact with the storage providers.
+
+The default constructor, seen as follows, will create a provider to interact with the default MinIO instance through the user's credentials. 
+
+``` python
+storage_service = client.create_storage_client() # returns a storage object
+```
+Additionally, if you need to interact with specific storage providers defined on a service, the constructor accepts a `svc` parameter where you can state the service name from which to search for additional credentials.
 
 ``` python
 storage_service = client.create_storage_client("service_name") # returns a storage object
 ```
+
 > _Note_ : The `storage_provider` parameter on the storage methods follows the format: `["storage_provider_type"].["storage_provider_name"]` where `storage_provider_type` is one of the suported storage providers (minIO, S3, Onedata or webdav) and `storage_provider_name` is the identifier _(ex: minio.default)_
 
 **list_files_from_path**
@@ -246,3 +266,5 @@ response = storage_service.upload_file("storage_provider", "local_path", "remote
 # download a file from a remote path to a local path 
 response = storage_service.download_file("storage_provider", "local_path", "remote_path")
 ```
+
+

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python.egg-info/SOURCES.txt

@@ -2,12 +2,14 @@ LICENSE
 README.md
 setup.py
 oscar_python/__init__.py
+oscar_python/_oidc.py
 oscar_python/_utils.py
 oscar_python/client.py
 oscar_python/client_anon.py
 oscar_python/default_client.py
 oscar_python/local_test.py
 oscar_python/storage.py
+oscar_python/test_v2.py
 oscar_python.egg-info/PKG-INFO
 oscar_python.egg-info/SOURCES.txt
 oscar_python.egg-info/dependency_links.txt
@@ -21,6 +23,7 @@ oscar_python/_providers/_s3.py
 oscar_python/_providers/_webdav.py
 tests/test_client.py
 tests/test_default_client.py
+tests/test_oidc.py
 tests/test_onedata.py
 tests/test_s3.py
 tests/test_storage.py

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python.egg-info/top_level.txt

@@ -1,3 +1,5 @@
+build
+dist
 jupyter_example
 oscar_python
 tests

{oscar_python-1.3.0 → oscar_python-1.3.1}/tests/test_client.py

@@ -44,6 +44,15 @@ def test_oidc_client(options):
     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)

oscar_python-1.3.1/tests/test_oidc.py

@@ -0,0 +1,38 @@
+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"
+            }
+        )

{oscar_python-1.3.0 → oscar_python-1.3.1}/tests/test_storage.py

@@ -11,9 +11,9 @@ def mock_client_obj():
 @pytest.fixture
 def storage(mock_client_obj):
     mock_response = MagicMock()
-    mock_response.text = '{"storage_providers": {"minio": {"default": {"access_key": "key","secret_key": "secret", "endpoint": "http://test.endpoint", "region": "us-east-1", "verify": false}}}}'
+    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, "test_service")
+        return Storage(mock_client_obj)
 
 
 def test_get_provider_creds(storage):

{oscar_python-1.3.0 → oscar_python-1.3.1}/tests/test_utils.py

@@ -29,7 +29,9 @@ def test_get_headers_with_oidc_agent():
 def test_get_headers_with_oidc():
     class MockClient:
         _AUTH_TYPE = "oidc"
-        oidc_token = "test_oidc_token"
+
+        def get_access_token(self):
+            return "test_oidc_token"
 
     c = MockClient()
     headers = utils.get_headers(c)

{oscar_python-1.3.0 → oscar_python-1.3.1}/oscar_python.egg-info/requires.txt

@@ -1,7 +1,7 @@
-webdavclient3==3.14.6
-requests
-boto3
-setuptools>=40.8.0
-pyyaml
 aiohttp
+boto3
 liboidcagent
+pyyaml
+requests
+setuptools>=40.8.0
+webdavclient3==3.14.6