qarnot 2.17.0__py3-none-any.whl → 2.19.0__py3-none-any.whl

qarnot/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-03-05T10:05:53+0100",
+ "date": "2025-09-04T17:06:17+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "559a43baceed056873c5b9dab07d987025306be8",
- "version": "v2.17.0"
+ "full-revisionid": "2436d80006a87be548b2235b12f0a6f041ef66c1",
+ "version": "v2.19.0"
 }
 '''  # END VERSION_JSON
 

qarnot/computing_quotas.py

@@ -0,0 +1,340 @@
+# Copyright 2025 Qarnot computing
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import Optional, List, Dict, Any
+
+
+class UserSchedulingQuota(object):
+    """Describes a scheduling quota for the user.
+    """
+
+    def __init__(self, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
+        """Create a new UserSchedulingQuota object describing a scheduling quota for the user.
+
+        :param int max_cores: Maximum number of cores that can be simultaneously used with this scheduling plan.
+        :param int running_cores_count: Number of cores that are currently running with this scheduling plan.
+        :param int max_instances: Maximum number of instances that can be simultaneously used with this scheduling plan.
+        :param int running_instances_count: Number of instances that are currently running with this scheduling plan.
+        :returns: The created :class:`~qarnot.computing_quotas.UserSchedulingQuota`.
+        """
+        self.max_cores = max_cores
+        """:type: :class:`int`
+
+        Maximum number of cores that can be simultaneously used with this scheduling plan.
+        """
+        self.running_cores_count = running_cores_count
+        """:type: :class:`int`
+
+        Number of cores that are currently running with this scheduling plan.
+        """
+        self.max_instances = max_instances
+        """:type: :class:`int`
+
+        Maximum number of instances that can be simultaneously used with this scheduling plan.
+        """
+        self.running_instances_count = running_instances_count
+        """:type: :class:`int`
+
+        Number of instances that are currently running with this scheduling plan.
+        """
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new UserSchedulingQuota object from json describing a scheduling quota for a user.
+
+        :param dict json: Dictionary representing the user scheduling plan
+        :returns: The created :class:`~qarnot.computing_quotas.UserSchedulingQuota`.
+        """
+        if json is None:
+            return None
+        return cls(
+            json.get('maxCores'),
+            json.get('runningCoresCount'),
+            json.get('maxInstances'),
+            json.get('runningInstancesCount'),
+        )
+
+
+class UserReservedSchedulingQuota(UserSchedulingQuota):
+    """Describes a reserved scheduling quota for the user.
+    """
+
+    def __init__(self, reservation_name: str, machine_key: str, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
+        """Create a new UserReservedSchedulingQuota object describing a reserved scheduling quota for the user.
+
+        :param str machine_key: Machine key of the reservation.
+        :param int max_cores: Maximum number of cores that can be simultaneously used with this reserved machine specification.
+        :param int running_cores_count: Number of cores that are currently running with this reserved machine specification.
+        :param int max_instances: Maximum number of instances that can be simultaneously used with this reserved machine specification.
+        :param int running_instances_count: Number of instances that are currently running with this reserved machine specification.
+        :returns: The created :class:`~qarnot.computing_quotas.UserReservedSchedulingQuota`.
+        """
+        super().__init__(max_cores, running_cores_count, max_instances, running_instances_count)
+        self.machine_key = machine_key
+        """:type: :class:`str`
+
+        Machine key of the reservation.
+        """
+        self.reservation_name = reservation_name
+        """:type: :class:`str`
+
+        Name of the reservation.
+        """
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new UserReservedSchedulingQuota object from json describing a reserved scheduling quota for a user.
+
+        :param dict json: Dictionary representing the user reserved scheduling quota
+        :returns: The created :class:`~qarnot.computing_quotas.UserReservedSchedulingQuota`.
+        """
+        if json is None:
+            return None
+        return cls(
+            json.get('reservationName'),
+            json.get('machineKey'),
+            json.get('maxCores'),
+            json.get('runningCoresCount'),
+            json.get('maxInstances'),
+            json.get('runningInstancesCount'),
+        )
+
+
+class UserComputingQuotas(object):
+    """Describes the user's computing quotas.
+    """
+
+    def __init__(self, flex: UserSchedulingQuota, on_demand: UserSchedulingQuota, reserved: List[UserReservedSchedulingQuota]):
+        """Create a new UserComputingQuotas object describing the user's computing quotas.
+
+        :param `~qarnot.computing_quotas.UserSchedulingQuota` flex: Quotas for Flex scheduling plan.
+        :param `~qarnot.computing_quotas.UserSchedulingQuota` on_demand: Quotas for OnDemand scheduling plan.
+        :param List of `~qarnot.computing_quotas.UserReservedSchedulingQuota` reserved: Quotas for Reserved scheduling plan.
+        :returns: The created :class:`~qarnot.computing_quotas.UserComputingQuotas`.
+        """
+        self.flex = flex
+        """:type: :class:`~qarnot.computing_quotas.UserSchedulingQuota`
+
+        Quotas for Flex scheduling plan."""
+        self.on_demand = on_demand
+        """:type: :class:`~qarnot.computing_quotas.UserSchedulingQuota`
+
+        Quotas for OnDemand scheduling plan."""
+        self.reserved = reserved
+        """:type: list(:class:`~qarnot.computing_quotas.UserReservedSchedulingQuota`)
+
+        Quotas for Reserved scheduling plan."""
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new UserComputingQuotas object from json describing the user's computing quotas.
+
+        :param dict json: Dictionary representing the user computing quota
+        :returns: The created :class:`~qarnot.computing_quotas.UserComputingQuotas`.
+        """
+        if json is None:
+            return None
+        return cls(
+            UserSchedulingQuota.from_json(json.get('flex')),
+            UserSchedulingQuota.from_json(json.get('onDemand')),
+            [UserReservedSchedulingQuota.from_json(v) for v in (json.get('reserved') if json.get('reserved') is not None else []) if v is not None]
+        )
+
+
+class OrganizationSchedulingQuota(object):
+    """Describes a scheduling quota for the organization.
+    """
+
+    def __init__(self, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
+        """Create a new OrganizationSchedulingQuota object describing a scheduling quota for the organization.
+
+        :param int max_cores: Maximum number of cores that can be simultaneously used with this scheduling plan.
+        :param int running_cores_count: Number of cores that are currently running with this scheduling plan.
+        :param int max_instances: Maximum number of instances that can be simultaneously used with this scheduling plan.
+        :param int running_instances_count: Number of instances that are currently running with this scheduling plan.
+        :returns: The created :class:`~qarnot.computing_quotas.OrganizationSchedulingQuota`.
+        """
+        self.max_cores = max_cores
+        """:type: :class:`int`
+
+        Maximum number of cores that can be simultaneously used with this scheduling plan.
+        """
+        self.running_cores_count = running_cores_count
+        """:type: :class:`int`
+
+        Number of cores that are currently running with this scheduling plan.
+        """
+        self.max_instances = max_instances
+        """:type: :class:`int`
+
+        Maximum number of instances that can be simultaneously used with this scheduling plan.
+        """
+        self.running_instances_count = running_instances_count
+        """:type: :class:`int`
+
+        Number of instances that are currently running with this scheduling plan.
+        """
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new OrganizationSchedulingQuota object from json describing a scheduling quota for the organization.
+
+        :param dict json: Dictionary representing the organization scheduling plan
+        :returns: The created :class:`~qarnot.computing_quotas.OrganizationSchedulingQuota`.
+        """
+        if json is None:
+            return None
+        return cls(
+            json.get('maxCores'),
+            json.get('runningCoresCount'),
+            json.get('maxInstances'),
+            json.get('runningInstancesCount'),
+        )
+
+
+class OrganizationReservedSchedulingQuota(OrganizationSchedulingQuota):
+    """Describes a reserved scheduling quota for the organization.
+    """
+
+    def __init__(self, reservation_name: str, machine_key: str, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
+        """Create a new OrganizationReservedSchedulingQuota object describing a reserved scheduling quota for the organization.
+
+        :param str machine_key: Machine key of the reservation.
+        :param int max_cores: Maximum number of cores that can be simultaneously used with this reserved machine specification.
+        :param int running_cores_count: Number of cores that are currently running with this reserved machine specification.
+        :param int max_instances: Maximum number of instances that can be simultaneously used with this reserved machine specification.
+        :param int running_instances_count: Number of instances that are currently running with this reserved machine specification.
+        :returns: The created :class:`~qarnot.computing_quotas.OrganizationReservedSchedulingQuota`.
+        """
+        super().__init__(max_cores, running_cores_count, max_instances, running_instances_count)
+        self.machine_key = machine_key
+        """:type: :class:`str`
+
+        Machine key of the reservation.
+        """
+        self.reservation_name = reservation_name
+        """:type: :class:`str`
+
+        Name of the reservation.
+        """
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new OrganizationReservedSchedulingQuota object from json describing a reserved scheduling quota for a organization.
+
+        :param dict json: Dictionary representing the organization reserved scheduling quota
+        :returns: The created :class:`~qarnot.computing_quotas.OrganizationReservedSchedulingQuota`.
+        """
+        if json is None:
+            return None
+        return cls(
+            json.get('reservationName'),
+            json.get('machineKey'),
+            json.get('maxCores'),
+            json.get('runningCoresCount'),
+            json.get('maxInstances'),
+            json.get('runningInstancesCount'),
+        )
+
+
+class OrganizationComputingQuotas(object):
+    """Describes the organization's computing quotas.
+    """
+
+    def __init__(self, name: str, flex: OrganizationSchedulingQuota, on_demand: OrganizationSchedulingQuota, reserved: List[OrganizationReservedSchedulingQuota]):
+        """Create a new OrganizationComputingQuotas object describing the organization's computing quotas.
+
+        :param `str` name: Name of the organization.
+        :param `~qarnot.computing_quotas.OrganizationSchedulingQuota` flex: Quotas for Flex scheduling plan.
+        :param `~qarnot.computing_quotas.OrganizationSchedulingQuota` on_demand: Quotas for OnDemand scheduling plan.
+        :param List of `~qarnot.computing_quotas.OrganizationReservedSchedulingQuota` reserved: Quotas for Reserved scheduling plan.
+        :returns: The created :class:`~qarnot.computing_quotas.OrganizationComputingQuotas`.
+        """
+        self.name = name
+        """:type: :class:`str`
+
+        Name of the organization."""
+        self.flex = flex
+        """:type: :class:`~qarnot.computing_quotas.OrganizationSchedulingQuota`
+
+        Quotas for Flex scheduling plan."""
+        self.on_demand = on_demand
+        """:type: :class:`~qarnot.computing_quotas.OrganizationSchedulingQuota`
+
+        Quotas for OnDemand scheduling plan."""
+        self.reserved = reserved
+        """:type: list(:class:`~qarnot.computing_quotas.OrganizationReservedSchedulingQuota`)
+
+        Quotas for Reserved scheduling plan."""
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new OrganizationComputingQuotas object from json describing the organization's computing quotas.
+
+        :param dict json: Dictionary representing the organization computing quota
+        :returns: The created :class:`~qarnot.computing_quotas.OrganizationComputingQuotas`.
+        """
+        if json is None:
+            return None
+        return cls(
+            json.get('name'),
+            OrganizationSchedulingQuota.from_json(json.get('flex')),
+            OrganizationSchedulingQuota.from_json(json.get('onDemand')),
+            [OrganizationReservedSchedulingQuota.from_json(v) for v in (json.get('reserved') if json.get('reserved') is not None else []) if v is not None]
+        )
+
+
+class ComputingQuotas(object):
+    """Describes user and organization computing quotas.
+    """
+
+    def __init__(self, user_computing_quotas: Optional[UserComputingQuotas], organization_computing_quotas: Optional[OrganizationComputingQuotas] = None):
+        """Create a new ComputingQuotas object describing user and organization computing quotas.
+
+        :param user_computing_quotas: the user related computing quotas
+        :type user_computing_quotas: `~qarnot.computing_quotas.UserComputingQuotas`, optional
+        :param organization_computing_quotas: the organization related computing quotas
+        :type organization_computing_quotas: `~qarnot.computing_quotas.OrganizationComputingQuotas`, optional
+        :returns: The created :class:`~qarnot.computing_quotas.ComputingQuotas`.
+        """
+        self.user = user_computing_quotas
+        """:type: :class:`~qarnot.computing_quotas.UserComputingQuotas`
+
+        The user related computing quotas."""
+        self.organization = organization_computing_quotas
+        """:type: :class:`~qarnot.computing_quotas.OrganizationComputingQuotas`
+
+        The organization related computing quotas."""
+
+    @classmethod
+    def from_json(cls, json: Dict[str, Any]):
+        """Create a new ComputingQuotas object from json describing user and organization computing quotas.
+
+        :param dict json: Dictionary representing the computing quotas
+        :returns: The created :class:`~qarnot.computing_quotas.ComputingQuotas`
+        """
+        if json is None:
+            return None
+        user_computing_quotas = UserComputingQuotas.from_json(json.get('user'))
+        organization_computing_quotas = OrganizationComputingQuotas.from_json(json.get('organization'))
+        return cls(user_computing_quotas, organization_computing_quotas)
+
+    @classmethod
+    def from_json_legacy(cls, json: Dict[str, Any]):
+        if json is None:
+            return None
+        flex = UserSchedulingQuota(json.get('maxFlexCores'), json.get('runningFlexCoreCount'), json.get('maxFlexInstances'), json.get('runningFlexInstanceCount'))
+        onDemand = UserSchedulingQuota(json.get('maxOnDemandCores'), json.get('runningOnDemandCoreCount'), json.get('maxOnDemandInstances'), json.get('runningOnDemandInstanceCount'))
+        user = UserComputingQuotas(flex, onDemand, [])
+        return cls(user, None)

qarnot/connection.py

@@ -28,6 +28,7 @@ from .task import Task, BulkTaskResponse
 from .pool import Pool
 from .paginate import PaginateResponse, OffsetResponse
 from .bucket import Bucket
+from .computing_quotas import ComputingQuotas
 from .job import Job
 from ._filter import create_pool_filter, create_task_filter, create_job_filter
 from ._retry import with_retry
@@ -95,8 +96,8 @@ class Connection(object):
            unsafe=False
 
         """
-        self.logger = logger if logger is not None else Log.get_logger_for_stream(sys.stdout)
-        self.logger_stderr = logger if logger is not None else Log.get_logger_for_stream(sys.stderr)  # to avoid breaking change of task stderr logs
+        self.logger = logger if logger is not None else Log.get_logger_for_stream(sys.stdout, "stdout")
+        self.logger_stderr = logger if logger is not None else Log.get_logger_for_stream(sys.stderr, "stderr")  # to avoid breaking change of task stderr logs
         self._version = "qarnot-sdk-python/" + __version__
         self._http = requests.session()
         self._retry_count = retry_count
@@ -997,21 +998,37 @@ class UserInfo(object):
         """:type: :class:`int`
 
         Number of cores currently submitted or running."""
-        self.max_flex_instances = info.get('maxFlexInstances')
+        self.computing_quotas = ComputingQuotas.from_json(info.get('computingQuotas')) or ComputingQuotas.from_json_legacy(info)
+        """:type: :class:`~qarnot.computing_quotas.ComputingQuotas`
+
+        Computing quotas information of the user and his organization."""
+        self.max_flex_instances = self.computing_quotas.user.flex.max_instances if self.computing_quotas is not None else info.get('maxFlexInstances')
         """:type: :class:`int`
 
+        .. deprecated:: v2.18.0
+           Use `self.computing_quotas` instead.
+
         Maximum number of instances simultaneously used with Flex scheduling plan."""
-        self.max_flex_cores = info.get('maxFlexCores')
+        self.max_flex_cores = self.computing_quotas.user.flex.max_cores if self.computing_quotas is not None else info.get('maxFlexCores')
         """:type: :class:`int`
 
+        .. deprecated:: v2.18.0
+           Use `self.computing_quotas` instead.
+
         Maximum number of cores simultaneously used with Flex scheduling plan."""
-        self.max_on_demand_instances = info.get('maxOnDemandInstances')
+        self.max_on_demand_instances = self.computing_quotas.user.on_demand.max_instances if self.computing_quotas is not None else info.get('maxOnDemandInstances')
         """:type: :class:`int`
 
+        .. deprecated:: v2.18.0
+           Use `self.computing_quotas` instead.
+
         Maximum number of instances simultaneously used with OnDemand scheduling plan."""
-        self.max_on_demand_cores = info.get('maxOnDemandCores')
+        self.max_on_demand_cores = self.computing_quotas.user.on_demand.max_cores if self.computing_quotas is not None else info.get('maxOnDemandCores')
         """:type: :class:`int`
 
+        .. deprecated:: v2.18.0
+           Use `self.computing_quotas` instead.
+
         Maximum number of cores simultaneously used with OnDemand scheduling plan."""
 
 

qarnot/forced_network_rule.py

@@ -20,7 +20,18 @@ class ForcedNetworkRule(object):
             priority: str = None,
             description: str = None,
             to_qbox: Optional[bool] = None,
-            to_payload: Optional[bool] = None):
+            to_payload: Optional[bool] = None,
+            name: str = None,
+            application_type: str = None):
+
+        self.name = name
+        """:type: :class:`str`
+
+        Name of the associated rule."""
+        self.application_type = application_type
+        """:type: :class:`str`
+
+        Application layer protocol used / hint about it (e.g. ssh, http, https...)."""
         self.inbound = inbound
         """:type: :class:`bool`
 
@@ -84,6 +95,14 @@ class ForcedNetworkRule(object):
         :returns: The created :class:`~qarnot.forced_network_rule.ForcedNetworkRule`
         """
 
+        name: str = None
+        if 'name' in json:
+            name = str(json.get("name"))
+
+        application_type: str = None
+        if 'applicationType' in json:
+            application_type = str(json.get("applicationType"))
+
         inbound: bool = bool(json.get("inbound"))
         proto: str = str(json.get("proto"))
 
@@ -96,12 +115,12 @@ class ForcedNetworkRule(object):
             to = str(json.get("to"))
 
         public_host: str = None
-        if 'public_host' in json:
-            public_host = str(json.get("public_host"))
+        if 'publicHost' in json:
+            public_host = str(json.get("publicHost"))
 
         public_port: str = None
-        if 'public_port' in json:
-            public_port = str(json.get("public_port"))
+        if 'publicPort' in json:
+            public_port = str(json.get("publicPort"))
 
         forwarder: str = None
         if 'forwarder' in json:
@@ -116,12 +135,12 @@ class ForcedNetworkRule(object):
             description = str(json.get("description"))
 
         to_qbox: Optional[bool] = None
-        if 'to_qbox' in json:
-            to_qbox = bool(json.get("to_qbox"))
+        if 'toQBox' in json:
+            to_qbox = bool(json.get("toQBox"))
 
         to_payload: Optional[bool] = None
-        if 'to_payload' in json:
-            to_payload = bool(json.get("to_payload"))
+        if 'toPayload' in json:
+            to_payload = bool(json.get("toPayload"))
 
         return ForcedNetworkRule(
             inbound,
@@ -134,7 +153,9 @@ class ForcedNetworkRule(object):
             priority,
             description,
             to_qbox,
-            to_payload)
+            to_payload,
+            name,
+            application_type)
 
     def to_json(self):
         result: Dict[str, Union[str, bool]] = {
@@ -142,6 +163,12 @@ class ForcedNetworkRule(object):
             "proto": self.proto,
         }
 
+        if self.name is not None:
+            result["name"] = self.name
+
+        if self.application_type is not None:
+            result["applicationType"] = self.application_type
+
         if self.port is not None:
             result["port"] = self.port
 
@@ -149,10 +176,10 @@ class ForcedNetworkRule(object):
             result["to"] = self.to
 
         if self.public_host is not None:
-            result["public_host"] = self.public_host
+            result["publicHost"] = self.public_host
 
         if self.public_port is not None:
-            result["public_port"] = self.public_port
+            result["publicPort"] = self.public_port
 
         if self.forwarder is not None:
             result["forwarder"] = self.forwarder
@@ -164,9 +191,9 @@ class ForcedNetworkRule(object):
             result["description"] = self.description
 
         if self.to_qbox is not None:
-            result["to_qbox"] = self.to_qbox
+            result["toQBox"] = self.to_qbox
 
         if self.to_payload is not None:
-            result["to_payload"] = self.to_payload
+            result["toPayload"] = self.to_payload
 
         return result

qarnot/helper.py

@@ -14,7 +14,7 @@ class Log():
     """
 
     @staticmethod
-    def get_logger_for_stream(stream: TextIO = None, log_format: str = DEFAULT_LOG_FORMAT):
+    def get_logger_for_stream(stream: TextIO = None, name: str = None, log_format: str = DEFAULT_LOG_FORMAT):
         """Create a logger whose output is a stream.
 
         :param TextIO stream:
@@ -31,12 +31,13 @@ class Log():
         :rtype: logging.Logger
         :returns: The created logger.
         """
-
+        if name is None:
+            name = __name__
         formatter = logging.Formatter(log_format)
         handler = logging.StreamHandler(stream if stream is not None else sys.stdout)
         handler.setFormatter(formatter)
 
-        logger = logging.getLogger(__name__)
+        logger = logging.getLogger(name)
         logger.addHandler(handler)
         logger.setLevel(logging.INFO)
         return logger

qarnot/multi_slots_settings.py

@@ -0,0 +1,48 @@
+"""Multi Slots Settings that can be used when creating a pool"""
+
+from typing import Dict
+
+
+class MultiSlotsSettings(object):
+    """Represents task multi slots settings."""
+
+    _slotsPerNode: int = None
+
+    def __init__(self, slotsPerNode: int = None):
+        """Create a new :class:`~qarnot.multi_slots_settings.MultiSlotsSettings`.
+
+        :param slotsPerNode: slots per node
+        :type slotsPerNode: int
+        """
+        self._slotsPerNode = slotsPerNode
+
+    @classmethod
+    def from_json(cls, json: Dict[str, int]):
+        """Create the multi slots settings from json.
+
+        :param dict json: Dictionary representing the multi slots settings
+        :returns: The created :class:`~qarnot.multi_slots_settings.MultiSlotsSettings`
+        """
+        slotsPerNode: int = json.get("slotsPerNode")
+        return MultiSlotsSettings(slotsPerNode)
+
+    def to_json(self) -> Dict[str, int]:
+        """Get a dict ready to be json packed.
+
+        :return: the json elements of the class.
+        :rtype: `dict`
+        """
+        return {
+            "slotsPerNode": self._slotsPerNode
+        }
+
+    def __eq__(self, other):
+        if other is None or not isinstance(other, MultiSlotsSettings):
+            return False
+        return self._slotsPerNode == other._slotsPerNode
+
+    def __str__(self) -> str:
+        return "multi slots settings: slotsPerNode {}.".format(self._slotsPerNode)
+
+    def __repr__(self) -> str:
+        return "multi_slots_settings.MultiSlotsSettings(slotsPerNode: {})".format(self._slotsPerNode)

qarnot/pool.py

@@ -19,6 +19,7 @@ from typing import Dict, List, Optional
 
 from qarnot.carbon_facts import CarbonClient, CarbonFacts
 from qarnot.retry_settings import RetrySettings
+from qarnot.multi_slots_settings import MultiSlotsSettings
 from qarnot.forced_network_rule import ForcedNetworkRule
 from qarnot.secrets import SecretsAccessRights
 
@@ -86,6 +87,7 @@ class Pool(object):
         self._update_cache_time = 5
         self._scheduling_type = scheduling_type
         self._targeted_reserved_machine_key: str = None
+        self._targeted_reservation_name: str = None
 
         self._last_cache = time.time()
         self._instancecount = instancecount
@@ -114,6 +116,7 @@ class Pool(object):
         self._queued_or_running_task_instances_count = 0.0
 
         self._completion_time_to_live = "00:00:00"
+        self._max_time_queue_seconds: int = None
         self._auto_delete = False
         self._tasks_wait_for_synchronization = False
 
@@ -127,6 +130,7 @@ class Pool(object):
         self._default_resources_cache_ttl_sec: Optional[int] = None
         self._privileges: Privileges = Privileges()
         self._default_retry_settings: RetrySettings = RetrySettings()
+        self._multi_slots_settings: Optional[MultiSlotsSettings] = None
         self._forced_network_rules: List[ForcedNetworkRule] = []
         self._secrets_access_rights: SecretsAccessRights = SecretsAccessRights()
 
@@ -215,6 +219,8 @@ class Pool(object):
         if 'completionTimeToLive' in json_pool:
             self._completion_time_to_live = json_pool.get("completionTimeToLive")
 
+        self._max_time_queue_seconds = json_pool.get("maxTimeQueueSeconds", None)
+
         if 'elasticProperty' in json_pool:
             elasticProperty = json_pool.get("elasticProperty")
             self._is_elastic = elasticProperty.get("isElastic")
@@ -235,10 +241,13 @@ class Pool(object):
         self._hardware_constraints = [HardwareConstraint.from_json(hw_constraint_dict) for hw_constraint_dict in json_pool.get("hardwareConstraints", [])]
         self._default_resources_cache_ttl_sec = json_pool.get("defaultResourcesCacheTTLSec", None)
         self._targeted_reserved_machine_key = json_pool.get("targetedReservedMachineKey", None)
+        self._targeted_reservation_name = json_pool.get("targetedReservationName", None)
         if 'privileges' in json_pool:
             self._privileges = Privileges.from_json(json_pool.get("privileges"))
         if 'defaultRetrySettings' in json_pool:
             self._default_retry_settings = RetrySettings.from_json(json_pool.get("defaultRetrySettings"))
+        if 'multiSlotsSettings' in json_pool:
+            self._multi_slots_settings = MultiSlotsSettings.from_json(json_pool.get("multiSlotsSettings"))
         if 'schedulingType' in json_pool:
             self._scheduling_type = SchedulingType.from_string(json_pool.get("schedulingType"))
         self._forced_network_rules = [ForcedNetworkRule.from_json(forced_network_dict) for forced_network_dict in json_pool.get("forcedNetworkRules", [])]
@@ -297,18 +306,27 @@ class Pool(object):
         json_pool['privileges'] = self._privileges.to_json()
         json_pool['defaultRetrySettings'] = self._default_retry_settings.to_json()
 
+        if self._max_time_queue_seconds is not None:
+            json_pool['maxTimeQueueSeconds'] = self._max_time_queue_seconds
+
         if self._scheduling_type is not None:
             json_pool['schedulingType'] = self._scheduling_type.schedulingType
 
         if self._targeted_reserved_machine_key is not None:
             json_pool['targetedReservedMachineKey'] = self._targeted_reserved_machine_key
 
+        if self._targeted_reservation_name is not None:
+            json_pool['targetedReservationName'] = self._targeted_reservation_name
+
         if self._forced_network_rules is not None:
             json_pool['forcedNetworkRules'] = [x.to_json() for x in self._forced_network_rules]
 
         if self._secrets_access_rights:
             json_pool['secretsAccessRights'] = self._secrets_access_rights.to_json()
 
+        if self._multi_slots_settings:
+            json_pool['multiSlotsSettings'] = self._multi_slots_settings.to_json()
+
         return json_pool
 
     def submit(self):
@@ -1273,6 +1291,24 @@ class Pool(object):
             raise AttributeError("can't set attribute on a submitted job")
         self._completion_time_to_live = _util.parse_to_timespan_string(value)
 
+    @property
+    def multi_slots_settings(self):
+        """
+        :getter:  Returns this pool's multi slots settings.
+        :type: :class:`~qarnot.multi_slots_settings.MultiSlotsSettings`
+        :default_value: None
+        """
+        self._update_if_summary()
+        return self._multi_slots_settings
+
+    @multi_slots_settings.setter
+    def multi_slots_settings(self, value):
+        """Setter for multi_slots_settings, this can only be set before pool's submission"""
+        self._update_if_summary()
+        if self._multi_slots_settings is not None:
+            raise AttributeError("can't set attribute on a submitted pool")
+        self._multi_slots_settings = value
+
     @property
     def previous_state(self):
         """
@@ -1431,6 +1467,22 @@ class Pool(object):
 
         self._privileges._exportApiAndStorageCredentialsInEnvironment = True
 
+    @property
+    def max_time_queue_seconds(self):
+        """
+        :type: :class:`uint`
+        :getter: Max time to wait before time out when there is not any place to execute the pool.
+
+        pool's max time queue seconds
+        """
+        self._update_if_summary()
+        return self._max_time_queue_seconds
+
+    @max_time_queue_seconds.setter
+    def max_time_queue_seconds(self, value: int):
+        """Setter for max_time_queue_seconds."""
+        self._max_time_queue_seconds = value
+
     @property
     def default_retry_settings(self) -> RetrySettings:
         """:type: :class:`~qarnot.retry_settings.RetrySettings`
@@ -1475,6 +1527,9 @@ class Pool(object):
 
         :getter: The reserved machine key when using the "reserved" scheduling type
 
+        .. deprecated:: v2.19.0
+           Use `self.targeted_reservation_name` instead.
+
         :raises AttributeError: trying to set this after the pool is submitted
         """
         return self._targeted_reserved_machine_key
@@ -1488,6 +1543,25 @@ class Pool(object):
 
         self._targeted_reserved_machine_key = value
 
+    @property
+    def targeted_reservation_name(self) -> str:
+        """:type: :class:`str`
+
+        :getter: The name of the reservation that describes the targeted machines when using the "reserved" scheduling type
+
+        :raises AttributeError: trying to set this after the task is submitted
+        """
+        return self._targeted_reservation_name
+
+    @targeted_reservation_name.setter
+    def targeted_reservation_name(self, value: str):
+        """Setted for targeted_reservation_name
+        """
+        if self.uuid is not None:
+            raise AttributeError("can't set attribute on a launched task")
+
+        self._targeted_reservation_name = value
+
     def __repr__(self):
         return '{0} - {1} - {2} - {3} - {5} - InstanceCount : {4} - Resources : {6} '\
             'Tag {7} - IsElastic {8} - ElasticMin {9} - ElasticMax {10} - ElasticMinIdle {11} -'\

qarnot/task.py

@@ -19,7 +19,7 @@ from os import makedirs, path
 import time
 import warnings
 import sys
-from typing import Dict, Optional, Union, List, Any, Callable
+from typing import Dict, Optional, Union, List, Any, Callable, Sequence
 
 from qarnot.carbon_facts import CarbonClient, CarbonFacts
 from qarnot.retry_settings import RetrySettings
@@ -40,6 +40,7 @@ from .exceptions import MissingTaskException, MaxTaskException, NotEnoughCredits
 
 try:
     from progressbar import AnimatedMarker, Bar, Percentage, AdaptiveETA, ProgressBar
+    from progressbar.widgets import WidgetBase
 except ImportError:
     pass
 
@@ -131,6 +132,7 @@ class Task(object):
         self._secrets_access_rights: SecretsAccessRights = SecretsAccessRights()
         self._scheduling_type = scheduling_type
         self._targeted_reserved_machine_key: str = None
+        self._targeted_reservation_name: str = None
         self._dependentOn: List[Uuid] = []
 
         self._auto_update = True
@@ -172,6 +174,7 @@ class Task(object):
         self._progress = None
         self._execution_time = None
         self._wall_time = None
+        self._max_time_queue_seconds: int = None
         self._end_date = None
         self._upload_results_on_cancellation: Optional[bool] = None
         self._hardware_constraints: List[HardwareConstraint] = []
@@ -513,11 +516,13 @@ class Task(object):
         self._progress = json_task.get("progress", None)
         self._execution_time = json_task.get("executionTime", None)
         self._wall_time = json_task.get("wallTime", None)
+        self._max_time_queue_seconds = json_task.get("maxTimeQueueSeconds", None)
         self._end_date = json_task.get("endDate", None)
         self._labels = json_task.get("labels", {})
         self._hardware_constraints = [HardwareConstraint.from_json(hw_constraint_dict) for hw_constraint_dict in json_task.get("hardwareConstraints", [])]
         self._default_resources_cache_ttl_sec = json_task.get("defaultResourcesCacheTTLSec", None)
         self._targeted_reserved_machine_key = json_task.get("targetedReservedMachineKey", None)
+        self._targeted_reservation_name = json_task.get("targetedReservationName", None)
         if 'privileges' in json_task:
             self._privileges = Privileges.from_json(json_task.get("privileges"))
         if 'retrySettings' in json_task:
@@ -589,7 +594,7 @@ class Task(object):
 
         if live_progress:
             try:
-                widgets = [
+                widgets: Sequence[WidgetBase | str] = [
                     Percentage(),
                     ' ', AnimatedMarker(),
                     ' ', Bar(),
@@ -1638,6 +1643,9 @@ class Task(object):
 
         :getter: The reserved machine key when using the "reserved" scheduling type
 
+        .. deprecated:: v2.19.0
+           Use `self.targeted_reservation_name` instead.
+
         :raises AttributeError: trying to set this after the task is submitted
         """
         return self._targeted_reserved_machine_key
@@ -1651,6 +1659,25 @@ class Task(object):
 
         self._targeted_reserved_machine_key = value
 
+    @property
+    def targeted_reservation_name(self) -> str:
+        """:type: :class:`str`
+
+        :getter: The name of the reservation that describes the targeted machines when using the "reserved" scheduling type
+
+        :raises AttributeError: trying to set this after the task is submitted
+        """
+        return self._targeted_reservation_name
+
+    @targeted_reservation_name.setter
+    def targeted_reservation_name(self, value: str):
+        """Setted for targeted_reservation_name
+        """
+        if self.uuid is not None:
+            raise AttributeError("can't set attribute on a launched task")
+
+        self._targeted_reservation_name = value
+
     @property
     def auto_delete(self):
         """Autodelete this Task if it is finished and your max number of task is reach
@@ -1778,6 +1805,22 @@ class Task(object):
         self._update_if_summary()
         return self._wall_time
 
+    @property
+    def max_time_queue_seconds(self):
+        """
+        :type: :class:`uint`
+        :getter: Max time to wait before time out when there is not any place to execute the task.
+
+        task's max time queue seconds
+        """
+        self._update_if_summary()
+        return self._max_time_queue_seconds
+
+    @max_time_queue_seconds.setter
+    def max_time_queue_seconds(self, value: int):
+        """Setter for max_time_queue_seconds."""
+        self._max_time_queue_seconds = value
+
     @property
     def snapshot_interval(self):
         """
@@ -1836,6 +1879,9 @@ class Task(object):
         self._resource_object_advanced = [x.to_json() for x in self._resource_objects]
         json_task['advancedResourceBuckets'] = self._resource_object_advanced
 
+        if self._max_time_queue_seconds is not None:
+            json_task['maxTimeQueueSeconds'] = self._max_time_queue_seconds
+
         if self._result_object is not None:
             json_task['resultBucket'] = self._result_object.uuid
             if self._result_object._cache_ttl_sec is not None:
@@ -1870,6 +1916,9 @@ class Task(object):
         if self._targeted_reserved_machine_key is not None:
             json_task["targetedReservedMachineKey"] = self._targeted_reserved_machine_key
 
+        if self._targeted_reservation_name is not None:
+            json_task["targetedReservationName"] = self._targeted_reservation_name
+
         if self._forced_network_rules is not None:
             json_task['forcedNetworkRules'] = [x.to_json() for x in self._forced_network_rules]
 

{qarnot-2.17.0.dist-info → qarnot-2.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: qarnot
-Version: 2.17.0
+Version: 2.19.0
 Summary: Qarnot Computing SDK
 Home-page: https://computing.qarnot.com
 Author: Qarnot computing
@@ -27,6 +27,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{qarnot-2.17.0.dist-info → qarnot-2.19.0.dist-info}/RECORD

@@ -2,29 +2,31 @@ qarnot/__init__.py,sha256=BCIFvWIe1EbzdZAMeKnyK9HYIqNHlSsbaaDMIL7VghA,5626
 qarnot/_filter.py,sha256=J--0lOY2rverPEE3zrvuipYkOd9T_4HrW4eVNJqheac,10109
 qarnot/_retry.py,sha256=4QdtI5Y_Jshja8zDxhx_g17dzABCIUGXQsjcPl65u7g,890
 qarnot/_util.py,sha256=fmAq55CmfDTTB7yaOLspayC3Mvre7SCzp0YwWsnwpDA,5673
-qarnot/_version.py,sha256=chMgPEmbIXhGcBM27CW6fzvB4p7Bey3pm6cl8OJmKEI,499
+qarnot/_version.py,sha256=cs1IDGNzxS3VmGc68RuKml3o2BY_Hw0Eo2b6p2eCVwI,499
 qarnot/advanced_bucket.py,sha256=dfhHOz0foJfEQoaCdGiS_-28w4Y6rq36ZloPgoEQiLE,7927
 qarnot/bucket.py,sha256=aNuJqfYUm2YCQ0m8SBl384xspYkc9SJy6_G-FEKs8nk,24449
 qarnot/carbon_facts.py,sha256=E_tBMsa2byEMgKAEilIFRsCE6_T978Zl7-ZXk4--PPI,10292
-qarnot/connection.py,sha256=qdwKRE66qeag9DKmLwK6VM0ppcK8h0Y2kyMjt3Y9F9o,45006
+qarnot/computing_quotas.py,sha256=gXKAZ1QqnXGzR17yTYNmjDF1TBEXALtCHzEe51wk4to,15882
+qarnot/connection.py,sha256=x71AuXeO33iyxbdoWEQecjsyI_8VSvX7PXztzsNpzLE,46022
 qarnot/error.py,sha256=WCkkILJzOi06Q5QRBfacU41D0MQeFCPsQc9Ub1Y6SXw,734
 qarnot/exceptions.py,sha256=yt_iwCw_9pFdoKeOTxsr05kqW5Gu-th3gSfos5zI26g,2729
 qarnot/forced_constant.py,sha256=-i4b_JO10YiWuJ7Q0bmWE_TEwtf8qSeLlkMTAbH55EM,1309
-qarnot/forced_network_rule.py,sha256=g83LOCRy3c6e5WayQMlk-eYUXQFZICROLh6FDQ8G73k,4515
+qarnot/forced_network_rule.py,sha256=gAalmj5p3MDXEG_jRfszhUTpOSKDMH_BFiXDuSnnyOc,5306
 qarnot/hardware_constraint.py,sha256=YZi4FgaJQ84mxVDT4u2WxqJ-i_bikwssidTRHRc3JHA,13694
-qarnot/helper.py,sha256=SAMcXt2GEcPuhV_ZzTOYs1Ucy4OdYGHVur472k36uoI,1498
+qarnot/helper.py,sha256=HWy0ollEMoGvCXbAY_FfgkhJjpHRRmkNtavvrJba2PY,1564
 qarnot/job.py,sha256=bag9NbugWCSf18J2c6nFKmWFFusXP58dfYYxd8CMsy8,19508
+qarnot/multi_slots_settings.py,sha256=RsSC-3YGu0wBsQlOgvJ8oMKFvApN6XEGdC5ozgQyXXs,1542
 qarnot/paginate.py,sha256=DaUYDPAS0M8hf0hph8GuMSzTASymSUOpp-WqbfevX-s,1387
-qarnot/pool.py,sha256=xBpRXQ0HB9u6fkdbDT18kbwUw9gErycKbUaL9TZ1-AQ,56269
+qarnot/pool.py,sha256=IaRYjCamrLHm9BWpjDmbxRhNIjb8f7m88wDIi6gGRa8,59165
 qarnot/privileges.py,sha256=6j3n8q_RNdZ8bBPD9misHEpS0CbcQByqzxlOu8CS-rU,1896
 qarnot/retry_settings.py,sha256=Illobh-1U8hPdzkffJu5TFKM_NdzCNYS2j1teBljX94,2512
 qarnot/scheduling_type.py,sha256=j90APc1ji7xe2Z9OH9l81tjO12k0Wf9bSaG-_UCyeNI,2223
 qarnot/secrets.py,sha256=v6-1UNhCnnW71eJYMeqhcUYLHnsnONGi4Qa3aoiG9qc,12354
 qarnot/status.py,sha256=dCVsh9_ewIASZcreATbUd2qJ-cUMk0cRkyVLdrOot3Q,12348
 qarnot/storage.py,sha256=jAist_J_6yzmRrkF5jqYNG3mhEP_y7KqCdNv4dJcHuM,6929
-qarnot/task.py,sha256=RCjJBKziSsmaeM4X8mwETw8zWmuvBinNPrYM8SNDdNU,75285
-qarnot-2.17.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-qarnot-2.17.0.dist-info/METADATA,sha256=Lu6BjY0AJyHk86KwBLu2_CC9vupq-Td07c2Yh2xFeKY,2521
-qarnot-2.17.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-qarnot-2.17.0.dist-info/top_level.txt,sha256=acRyoLZNyf_kuGTwHQgfZv2MfdTcZstyNjBhOxFtHzU,7
-qarnot-2.17.0.dist-info/RECORD,,
+qarnot/task.py,sha256=uUfnF2BDq6X8jcGaVRDgK2emFWydwbH_b2QdwXnhtzc,77172
+qarnot-2.19.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+qarnot-2.19.0.dist-info/METADATA,sha256=rR-mDeDXMVjIRA3PuZbTs2bLt9TAAxPO_EDv9mSRAb0,2543
+qarnot-2.19.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qarnot-2.19.0.dist-info/top_level.txt,sha256=acRyoLZNyf_kuGTwHQgfZv2MfdTcZstyNjBhOxFtHzU,7
+qarnot-2.19.0.dist-info/RECORD,,

{qarnot-2.17.0.dist-info → qarnot-2.19.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any