artesian-sdk 4.3.1.dev2__py3-none-any.whl → 5.0.0.dev2__py3-none-any.whl

Artesian/Exceptions.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Optional
 
 
 class ArtesianSdkException(Exception):
@@ -32,8 +31,8 @@ class ArtesianSdkRemoteException(ArtesianSdkException):
         method: str,
         url: str,
         statusCode: int,
-        problemDetails: Optional[dict] = None,
-        errorText: Optional[str] = None,
+        problemDetails: dict | None = None,
+        errorText: str | None = None,
     ) -> None:
         """
         Inits the Artesian Sdk Remote Exception.
@@ -61,10 +60,7 @@ class ArtesianSdkRemoteException(ArtesianSdkException):
             detail = errorText
 
         params = {"method": method, "url": url, "statusCode": statusCode}
-        message = (
-            "Failed REST call to Artesian. "
-            + "{method} {url} returned {statusCode}.".format(**params)
-        )
+        message = "Failed REST call to Artesian. " + "{method} {url} returned {statusCode}.".format(**params)
         if detail is not None:
             message = message + " " + detail
 
@@ -83,11 +79,11 @@ class ArtesianSdkRemoteException(ArtesianSdkException):
         return self._statusCode
 
     @property
-    def problemDetails(self: ArtesianSdkRemoteException) -> Optional[dict]:
+    def problemDetails(self: ArtesianSdkRemoteException) -> dict | None:
         return self._problemDetails
 
     @property
-    def errorText(self: ArtesianSdkRemoteException) -> Optional[str]:
+    def errorText(self: ArtesianSdkRemoteException) -> str | None:
         return self._errorText
 
 
@@ -101,8 +97,8 @@ class ArtesianSdkValidationException(ArtesianSdkRemoteException):
         method: str,
         url: str,
         statusCode: int,
-        problemDetails: Optional[dict] = None,
-        errorText: Optional[str] = None,
+        problemDetails: dict | None = None,
+        errorText: str | None = None,
     ) -> None:
         """
         Inits the Artesian Sdk Validation Exception.
@@ -114,9 +110,7 @@ class ArtesianSdkValidationException(ArtesianSdkRemoteException):
             problemDetails: the returned problemDetails object (if any)
             errorText: the response as text if problem details are not provided
         """
-        ArtesianSdkRemoteException.__init__(
-            self, method, url, statusCode, problemDetails, errorText
-        )
+        ArtesianSdkRemoteException.__init__(self, method, url, statusCode, problemDetails, errorText)
 
 
 class ArtesianSdkOptimisticConcurrencyException(ArtesianSdkRemoteException):
@@ -129,8 +123,8 @@ class ArtesianSdkOptimisticConcurrencyException(ArtesianSdkRemoteException):
         method: str,
         url: str,
         statusCode: int,
-        problemDetails: Optional[dict] = None,
-        errorText: Optional[str] = None,
+        problemDetails: dict | None = None,
+        errorText: str | None = None,
     ) -> None:
         """
         Inits the Artesian Sdk Optimistic Concurrency Exception.
@@ -142,9 +136,7 @@ class ArtesianSdkOptimisticConcurrencyException(ArtesianSdkRemoteException):
             problemDetails: the returned problemDetails object (if any)
             errorText: the response as text if problem details are not provided
         """
-        ArtesianSdkRemoteException.__init__(
-            self, method, url, statusCode, problemDetails, errorText
-        )
+        ArtesianSdkRemoteException.__init__(self, method, url, statusCode, problemDetails, errorText)
 
 
 class ArtesianSdkForbiddenException(ArtesianSdkRemoteException):
@@ -157,8 +149,8 @@ class ArtesianSdkForbiddenException(ArtesianSdkRemoteException):
         method: str,
         url: str,
         statusCode: int,
-        problemDetails: Optional[dict] = None,
-        errorText: Optional[str] = None,
+        problemDetails: dict | None = None,
+        errorText: str | None = None,
     ) -> None:
         """
         Inits the Artesian Sdk Forbidden Exception.
@@ -170,9 +162,7 @@ class ArtesianSdkForbiddenException(ArtesianSdkRemoteException):
             problemDetails: the returned problemDetails object (if any)
             errorText: the response as text if problem details are not provided
         """
-        ArtesianSdkRemoteException.__init__(
-            self, method, url, statusCode, problemDetails, errorText
-        )
+        ArtesianSdkRemoteException.__init__(self, method, url, statusCode, problemDetails, errorText)
 
 
 class ArtesianSdkServerException(ArtesianSdkRemoteException):
@@ -185,8 +175,8 @@ class ArtesianSdkServerException(ArtesianSdkRemoteException):
         method: str,
         url: str,
         statusCode: int,
-        problemDetails: Optional[dict] = None,
-        errorText: Optional[str] = None,
+        problemDetails: dict | None = None,
+        errorText: str | None = None,
     ) -> None:
         """
         Inits the Artesian Sdk Server Exception.
@@ -198,9 +188,7 @@ class ArtesianSdkServerException(ArtesianSdkRemoteException):
             problemDetails: the returned problemDetails object (if any)
             errorText: the response as text if problem details are not provided
         """
-        ArtesianSdkRemoteException.__init__(
-            self, method, url, statusCode, problemDetails, errorText
-        )
+        ArtesianSdkRemoteException.__init__(self, method, url, statusCode, problemDetails, errorText)
 
 
 class ArtesianSdkRequestException(ArtesianSdkException):

Artesian/GMEPublicOffers/ExtractionRangeConfig.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import Optional
 
 
 class ExtractionRangeConfig:
@@ -10,6 +9,6 @@ class ExtractionRangeConfig:
         date: Date for the Extraction Range configuration in (ISO) format
     """
 
-    def __init__(self: ExtractionRangeConfig, date: Optional[str] = None) -> None:
+    def __init__(self: ExtractionRangeConfig, date: str | None = None) -> None:
         """Inits the Extraction Range Configuration."""
         self.date = date

Artesian/GMEPublicOffers/GMEPublicOfferQuery.py

@@ -1,10 +1,14 @@
 from __future__ import annotations
-from typing import Any, List
-from Artesian._ClientsExecutor.RequestExecutor import _RequestExecutor
+
+import asyncio
+from urllib import parse
+
 from Artesian._ClientsExecutor.Client import _Client
+from Artesian._ClientsExecutor.RequestExecutor import _RequestExecutor
 from Artesian.GMEPublicOffers.GMEPublicOfferQueryParameters import (
     _GMEPublicOfferQueryParameters,
 )
+
 from ._Enum.BaType import BaType
 from ._Enum.GenerationType import GenerationType
 from ._Enum.Market import Market
@@ -13,16 +17,12 @@ from ._Enum.Scope import Scope
 from ._Enum.Status import Status
 from ._Enum.UnitType import UnitType
 from ._Enum.Zone import Zone
-import asyncio
-from urllib import parse
 
 
 class GMEPublicOfferQuery:
     __routePrefix = "extract"
 
-    def __init__(
-        self: GMEPublicOfferQuery, client: _Client, requestExecutor: _RequestExecutor
-    ) -> None:
+    def __init__(self: GMEPublicOfferQuery, client: _Client, requestExecutor: _RequestExecutor) -> None:
         """Inits _GME Public Offer Query"""
 
         queryParameters = _GMEPublicOfferQueryParameters()
@@ -30,9 +30,7 @@ class GMEPublicOfferQuery:
         self.__client = client
         self.__executor = requestExecutor
 
-    def withPagination(
-        self: GMEPublicOfferQuery, pagenumber: int, pagesize: int
-    ) -> GMEPublicOfferQuery:
+    def withPagination(self: GMEPublicOfferQuery, pagenumber: int, pagesize: int) -> GMEPublicOfferQuery:
         """
         Set the request pagination.
 
@@ -48,7 +46,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.pageSize = pagesize
         return self
 
-    def forScope(self: GMEPublicOfferQuery, scope: List[Scope]) -> GMEPublicOfferQuery:
+    def forScope(self: GMEPublicOfferQuery, scope: list[Scope]) -> GMEPublicOfferQuery:
         """
         Set the scopes to be queried.
 
@@ -74,9 +72,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.status = status
         return self
 
-    def forUnitType(
-        self: GMEPublicOfferQuery, unitType: List[UnitType]
-    ) -> GMEPublicOfferQuery:
+    def forUnitType(self: GMEPublicOfferQuery, unitType: list[UnitType]) -> GMEPublicOfferQuery:
         """
         Set the unit types to be queried.
 
@@ -102,7 +98,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.extractionRangeConfig.date = date
         return self
 
-    def forUnit(self: GMEPublicOfferQuery, unit: List[str]) -> GMEPublicOfferQuery:
+    def forUnit(self: GMEPublicOfferQuery, unit: list[str]) -> GMEPublicOfferQuery:
         """
         Set the units to be queried.
 
@@ -115,9 +111,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.unit = unit
         return self
 
-    def forOperators(
-        self: GMEPublicOfferQuery, operators: List[str]
-    ) -> GMEPublicOfferQuery:
+    def forOperators(self: GMEPublicOfferQuery, operators: list[str]) -> GMEPublicOfferQuery:
         """
         Set the operators to be queried.
 
@@ -130,7 +124,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.operators = operators
         return self
 
-    def forZone(self: GMEPublicOfferQuery, zone: List[Zone]) -> GMEPublicOfferQuery:
+    def forZone(self: GMEPublicOfferQuery, zone: list[Zone]) -> GMEPublicOfferQuery:
         """
         Set the zones to be queried.
 
@@ -143,9 +137,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.zone = zone
         return self
 
-    def forMarket(
-        self: GMEPublicOfferQuery, market: List[Market]
-    ) -> GMEPublicOfferQuery:
+    def forMarket(self: GMEPublicOfferQuery, market: list[Market]) -> GMEPublicOfferQuery:
         """
         Set the markets to be queried.
 
@@ -171,9 +163,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.purpose = purpose
         return self
 
-    def forBAType(
-        self: GMEPublicOfferQuery, baType: List[BaType]
-    ) -> GMEPublicOfferQuery:
+    def forBAType(self: GMEPublicOfferQuery, baType: list[BaType]) -> GMEPublicOfferQuery:
         """
         Set the BATypes to be queried.
 
@@ -186,9 +176,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.baType = baType
         return self
 
-    def forGenerationType(
-        self: GMEPublicOfferQuery, generationType: List[GenerationType]
-    ) -> GMEPublicOfferQuery:
+    def forGenerationType(self: GMEPublicOfferQuery, generationType: list[GenerationType]) -> GMEPublicOfferQuery:
         """
         Set the generation types to be queried.
 
@@ -201,7 +189,7 @@ class GMEPublicOfferQuery:
         self._queryParameters.generationType = generationType
         return self
 
-    def execute(self: GMEPublicOfferQuery) -> Any:
+    def execute(self: GMEPublicOfferQuery) -> object:
         """
         Execute GME Public Offer Query.
 
@@ -211,7 +199,7 @@ class GMEPublicOfferQuery:
         url = self.__buildRequest()
         return self._exec(url)
 
-    async def executeAsync(self: GMEPublicOfferQuery) -> Any:
+    async def executeAsync(self: GMEPublicOfferQuery) -> object:
         """
         Execute GME Public Offer Query.
 
@@ -225,57 +213,50 @@ class GMEPublicOfferQuery:
         self._validateQuery()
         qp = self._queryParameters
 
-        url = "/{0}/{1}/{2}/{3}?_=1".format(
-            self.__routePrefix,
-            self._buildExtractionRangeRoute(qp),
-            self.__getPurpose(qp.purpose),
-            self.__getStatus(qp.status),
-        )
+        url = f"/{self.__routePrefix}/{self._buildExtractionRangeRoute(qp)}/{self.__getPurpose(qp.purpose)}/{self.__getStatus(qp.status)}?_=1"
 
-        if not (qp.page is None):
+        if qp.page is not None:
             url = url + "&page=" + str(qp.page)
-        if not (qp.pageSize is None):
+        if qp.pageSize is not None:
             url = url + "&pageSize=" + str(qp.pageSize)
-        if not (qp.scope is None):
+        if qp.scope is not None:
             sep = ","
-            scope = sep.join(map(lambda x: self.__getScope(x), qp.scope))
+            scope = sep.join(map(self.__getScope, qp.scope))
             enc = parse.quote_plus(scope)
             url = url + "&scope=" + enc
-        if not (qp.unitType is None):
+        if qp.unitType is not None:
             sep = ","
-            unitType = sep.join(map(lambda x: self.__getUnitType(x), qp.unitType))
+            unitType = sep.join(map(self.__getUnitType, qp.unitType))
             enc = parse.quote_plus(unitType)
             url = url + "&unitType=" + enc
-        if not (qp.unit is None):
+        if qp.unit is not None:
             sep = ","
             unit = sep.join(map(str, qp.unit))
             enc = parse.quote_plus(unit)
             url = url + "&unit=" + enc
-        if not (qp.generationType is None):
+        if qp.generationType is not None:
             sep = ","
-            generationType = sep.join(
-                map(lambda x: self.__getGenerationType(x), qp.generationType)
-            )
+            generationType = sep.join(map(self.__getGenerationType, qp.generationType))
             enc = parse.quote_plus(generationType)
             url = url + "&generationType=" + enc
-        if not (qp.operators is None):
+        if qp.operators is not None:
             sep = ","
             operators = sep.join(map(str, qp.operators))
             enc = parse.quote_plus(operators)
             url = url + "&operators=" + enc
-        if not (qp.zone is None):
+        if qp.zone is not None:
             sep = ","
-            zone = sep.join(map(lambda x: self.__getZone(x), qp.zone))
+            zone = sep.join(map(self.__getZone, qp.zone))
             enc = parse.quote_plus(zone)
             url = url + "&zone=" + enc
-        if not (qp.market is None):
+        if qp.market is not None:
             sep = ","
-            market = sep.join(map(lambda x: self.__getMarket(x), qp.market))
+            market = sep.join(map(self.__getMarket, qp.market))
             enc = parse.quote_plus(market)
             url = url + "&market=" + enc
-        if not (qp.baType is None):
+        if qp.baType is not None:
             sep = ","
-            baType = sep.join(map(lambda x: self.__getBaType(x), qp.baType))
+            baType = sep.join(map(self.__getBaType, qp.baType))
             enc = parse.quote_plus(baType)
             url = url + "&baType=" + enc
 
@@ -294,12 +275,10 @@ class GMEPublicOfferQuery:
         }
         vr = switcher.get(scope, "DefScope")
         if vr == "DefScope":
-            raise Exception("Not supported Scope")
+            raise ValueError("Not supported Scope")
         return vr
 
-    def __getGenerationType(
-        self: GMEPublicOfferQuery, generationType: GenerationType
-    ) -> str:
+    def __getGenerationType(self: GMEPublicOfferQuery, generationType: GenerationType) -> str:
         switcher = {
             GenerationType.AUTOGENERATION: "AUTOGENERATION",
             GenerationType.BIOMASS: "BIOMASS",
@@ -316,7 +295,7 @@ class GMEPublicOfferQuery:
         }
         vr = switcher.get(generationType, "DefGen")
         if vr == "DefGen":
-            raise Exception("Not supported GeneratioType")
+            raise ValueError("Not supported GeneratioType")
         return vr
 
     def __getMarket(self: GMEPublicOfferQuery, market: Market) -> str:
@@ -344,24 +323,28 @@ class GMEPublicOfferQuery:
             Market.MIA3: "MIA3",
             Market.MRR: "MRR",
             Market.AFRR: "AFRR",
+            Market.GMP_ASTA: "GMP_ASTA",
+            Market.GMP_Cont: "GMP_Cont",
+            Market.MI_Cont: "MI_Cont",
+            Market.MGS: "MGS",
         }
         vr = switcher.get(market, "DefMarket")
         if vr == "DefMarket":
-            raise Exception("Not supported Market")
+            raise ValueError("Not supported Market")
         return vr
 
     def __getPurpose(self: GMEPublicOfferQuery, purpose: Purpose | None) -> str:
         if purpose is None:
-            raise Exception("Not supported Purpose")
+            raise ValueError("Not supported Purpose")
         switcher = {Purpose.BID: "BID", Purpose.OFF: "OFF"}
         vr = switcher.get(purpose, "Defpurp")
         if vr == "Defpurp":
-            raise Exception("Not supported Purpose")
+            raise ValueError("Not supported Purpose")
         return vr
 
     def __getStatus(self: GMEPublicOfferQuery, status: Status | None) -> str:
         if status is None:
-            raise Exception("Not supported Status")
+            raise ValueError("Not supported Status")
 
         switcher = {
             Status.ACC: "ACC",
@@ -372,10 +355,11 @@ class GMEPublicOfferQuery:
             Status.SUB: "SUB",
             Status.COM: "COM",
             Status.PCOM: "PCOM",
+            Status.DIS: "DIS",
         }
         vr = switcher.get(status, "DefStatus")
         if vr == "DefStatus":
-            raise Exception("Not supported Status")
+            raise ValueError("Not supported Status")
         return vr
 
     def __getUnitType(self: GMEPublicOfferQuery, unitType: UnitType) -> str:
@@ -389,7 +373,7 @@ class GMEPublicOfferQuery:
         }
         vr = switcher.get(unitType, "DefunitType")
         if vr == "DefunitType":
-            raise Exception("Not supported Unit Type")
+            raise ValueError("Not supported Unit Type")
         return vr
 
     def __getBaType(self: GMEPublicOfferQuery, baType: BaType) -> str:
@@ -401,7 +385,7 @@ class GMEPublicOfferQuery:
         }
         vr = switcher.get(baType, "DefbaType")
         if vr == "DefbaType":
-            raise Exception("Not supported BaType")
+            raise ValueError("Not supported BaType")
         return vr
 
     def __getZone(self: GMEPublicOfferQuery, zone: Zone) -> str:
@@ -434,25 +418,21 @@ class GMEPublicOfferQuery:
         }
         vr = switcher.get(zone, "DefZone")
         if vr == "DefZone":
-            raise Exception("Not supported Zone")
+            raise ValueError("Not supported Zone")
         return vr
 
-    def _buildExtractionRangeRoute(
-        self: GMEPublicOfferQuery, queryParamaters: _GMEPublicOfferQueryParameters
-    ) -> str:
+    def _buildExtractionRangeRoute(self: GMEPublicOfferQuery, queryParamaters: _GMEPublicOfferQueryParameters) -> str:
         subPath = f"{self.__toUrlParam(queryParamaters.extractionRangeConfig.date)}"
         return subPath
 
-    def _exec(self: GMEPublicOfferQuery, url: str) -> Any:
+    def _exec(self: GMEPublicOfferQuery, url: str) -> object:
         loop = get_event_loop()
         rr = loop.run_until_complete(self._execAsync(url))
         return rr
 
-    async def _execAsync(self: GMEPublicOfferQuery, url: str) -> Any:
+    async def _execAsync(self: GMEPublicOfferQuery, url: str) -> object:
         with self.__client as c:
-            res = await asyncio.gather(
-                *[self.__executor.exec(c.exec, "GET", url, None)]
-            )
+            res = await asyncio.gather(*[self.__executor.exec(c.exec, "GET", url, None)])
             return res[0]
 
     def __toUrlParam(self: GMEPublicOfferQuery, date: str | None) -> str:
@@ -460,20 +440,13 @@ class GMEPublicOfferQuery:
 
     def _validateQuery(self: GMEPublicOfferQuery) -> None:
         if self._queryParameters.purpose is None:
-            raise Exception(
-                "Extraction Purpose must be provided. Use .forScope()"
-                + " argument takes a scope type"
-            )
+            raise ValueError("Extraction Purpose must be provided. Use .forPurpose(); argument takes a purpose type")
         if self._queryParameters.extractionRangeConfig.date is None:
-            raise Exception(
-                "Extraction Date must be provided. Use .forDate() argument"
-                + " takes a string formatted as YYYY-MM-DD"
+            raise ValueError(
+                "Extraction Date must be provided. Use .forDate() argument" + " takes a string formatted as YYYY-MM-DD"
             )
         if self._queryParameters.status is None:
-            raise Exception(
-                "Extraction Status must be provided. Use .forStatus() "
-                + "argument takes a status type"
-            )
+            raise ValueError("Extraction Status must be provided. Use .forStatus() " + "argument takes a status type")
 
 
 def get_event_loop() -> asyncio.AbstractEventLoop:

Artesian/GMEPublicOffers/GMEPublicOfferQueryParameters.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
-from typing import List, Optional
-from .ExtractionRangeConfig import ExtractionRangeConfig
+
 from ._Enum.BaType import BaType
 from ._Enum.GenerationType import GenerationType
 from ._Enum.Market import Market
@@ -9,6 +8,7 @@ from ._Enum.Scope import Scope
 from ._Enum.Status import Status
 from ._Enum.UnitType import UnitType
 from ._Enum.Zone import Zone
+from .ExtractionRangeConfig import ExtractionRangeConfig
 
 
 class _GMEPublicOfferQueryParameters:
@@ -32,19 +32,19 @@ class _GMEPublicOfferQueryParameters:
 
     def __init__(
         self: _GMEPublicOfferQueryParameters,
-        page: Optional[int] = None,
-        pageSize: Optional[int] = None,
-        extractionRangeConfig: Optional[ExtractionRangeConfig] = None,
-        scope: Optional[List[Scope]] = None,
-        status: Optional[Status] = None,
-        unitType: Optional[List[UnitType]] = None,
-        generationType: Optional[List[GenerationType]] = None,
-        operators: Optional[List[str]] = None,
-        unit: Optional[List[str]] = None,
-        zone: Optional[List[Zone]] = None,
-        market: Optional[List[Market]] = None,
-        purpose: Optional[Purpose] = None,
-        baType: Optional[List[BaType]] = None,
+        page: int | None = None,
+        pageSize: int | None = None,
+        extractionRangeConfig: ExtractionRangeConfig | None = None,
+        scope: list[Scope] | None = None,
+        status: Status | None = None,
+        unitType: list[UnitType] | None = None,
+        generationType: list[GenerationType] | None = None,
+        operators: list[str] | None = None,
+        unit: list[str] | None = None,
+        zone: list[Zone] | None = None,
+        market: list[Market] | None = None,
+        purpose: Purpose | None = None,
+        baType: list[BaType] | None = None,
     ) -> None:
         """
         Inits the GME Public Offer Query Parameters with optional overrides.

Artesian/GMEPublicOffers/GMEPublicOfferService.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
+
+from Artesian._ClientsExecutor.Client import _Client
+from Artesian._ClientsExecutor.RequestExecutor import _RequestExecutor
 from Artesian.ArtesianConfig import ArtesianConfig
 from Artesian.ArtesianPolicyConfig import ArtesianPolicyConfig
-from Artesian._ClientsExecutor.RequestExecutor import _RequestExecutor
-from Artesian._ClientsExecutor.Client import _Client
 
 from .GMEPublicOfferQuery import GMEPublicOfferQuery
 
@@ -27,9 +28,7 @@ class GMEPublicOfferService:
         """
         self.__config = artesianConfig
         self.__policy = ArtesianPolicyConfig()
-        self.__queryBaseurl = (
-            self.__config.baseUrl + "/" + self.__offerstype + "/" + self.__version
-        )
+        self.__queryBaseurl = self.__config.baseUrl + "/" + self.__offerstype + "/" + self.__version
         self.__executor = _RequestExecutor(self.__policy)
         self.__client = _Client(self.__queryBaseurl, self.__config.apiKey)
 

Artesian/GMEPublicOffers/_Enum/Market.py

@@ -25,3 +25,7 @@ class Market(Enum):
     MIXBID = 70
     AFRR = 100
     AFRE = 200
+    GMP_ASTA = 230
+    GMP_Cont = 234
+    MI_Cont = 235
+    MGS = 240

Artesian/GMEPublicOffers/_Enum/Status.py

@@ -11,3 +11,4 @@ class Status(Enum):
     COM = 7
     PCOM = 8
     PREJ = 9
+    DIS = 10

Artesian/GMEPublicOffers/__init__.py

@@ -1,23 +1,23 @@
 from ._Enum.BaType import BaType
-from ._Enum.Scope import Scope
 from ._Enum.GenerationType import GenerationType
 from ._Enum.Market import Market
 from ._Enum.Purpose import Purpose
+from ._Enum.Scope import Scope
 from ._Enum.Status import Status
 from ._Enum.UnitType import UnitType
 from ._Enum.Zone import Zone
-from .GMEPublicOfferService import GMEPublicOfferService
 from .GMEPublicOfferQuery import GMEPublicOfferQuery
+from .GMEPublicOfferService import GMEPublicOfferService
 
 __all__ = [
-    GMEPublicOfferService.__name__,
-    GMEPublicOfferQuery.__name__,
-    BaType.__name__,
-    Scope.__name__,
-    GenerationType.__name__,
-    Market.__name__,
-    Purpose.__name__,
-    Status.__name__,
-    UnitType.__name__,
-    Zone.__name__,
-]  # type: ignore
+    "BaType",
+    "GMEPublicOfferQuery",
+    "GMEPublicOfferService",
+    "GenerationType",
+    "Market",
+    "Purpose",
+    "Scope",
+    "Status",
+    "UnitType",
+    "Zone",
+]