diff --git a/requirements.txt b/requirements.txt index 8012c0c..656f634 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ flask-restful==0.3.10 requests==2.32.* # ogd packages opengamedata-common==2.0.* -opengamedata-core==0.0.14 diff --git a/src/ogd/apis/models/APIResponse.py b/src/ogd/apis/models/APIResponse.py index 7e8a376..68a8015 100644 --- a/src/ogd/apis/models/APIResponse.py +++ b/src/ogd/apis/models/APIResponse.py @@ -17,7 +17,6 @@ # import OGD libraries from ogd.common.utils.typing import Map from ogd.common.utils.Logger import Logger -import ogd.core.requests.RequestResult as RequestResult # Import local files from ogd.apis.models.enums.RESTType import RESTType @@ -59,24 +58,6 @@ def Default(req_type:RESTType): status=ResponseStatus.NONE ) - @staticmethod - def FromRequestResult(result:RequestResult.RequestResult, req_type:RESTType) -> "APIResponse": - """Generate an `APIResponse` from an OGD `RequestResult`. - - The `RequestResult` indicates the result of a data export request. - Thus, this builder for an `APIResponse` is included as a convenient way to set up a response for the Data API. - - :param result: The result object from an OGD export request - :type result: RequestResult.RequestResult - :param req_type: The REST request type that triggered the export request - :type req_type: RESTType - :return: An `APIResponse` corresponding to the result of the export request - :rtype: APIResponse - """ - _status = ResponseStatus.FromOGDResult(result.Status) - ret_val = APIResponse(req_type=req_type, val={"session_count":result.SessionCount, "duration":str(result.Duration)}, msg=result.Message, status=_status) - return ret_val - @staticmethod def FromResponse(result:requests.Response) -> "APIResponse": ret_val : APIResponse diff --git a/src/ogd/apis/models/enums/ResponseStatus.py b/src/ogd/apis/models/enums/ResponseStatus.py index ce7cd17..13566e0 100644 --- a/src/ogd/apis/models/enums/ResponseStatus.py +++ b/src/ogd/apis/models/enums/ResponseStatus.py @@ -1,8 +1,6 @@ from enum import IntEnum from typing import Set -import ogd.core.requests.RequestResult as RequestResult - class ResponseStatus(IntEnum): """Enumerated type to track the status of an API request result. """ @@ -101,27 +99,6 @@ def ServerErrors() -> Set["ResponseStatus"]: """ return {status for status in set(ResponseStatus) if status in range(500, 599)} - @staticmethod - def FromOGDResult(result_status:RequestResult.ResultStatus) -> "ResponseStatus": - """Get a ResponseStatus equivalent to given ResultStatus from OGD-core - - :param result_status: An OGD-core ResultStatus - :type result_status: ogd.core.requests.RequestResult.ResultStatus - :return: A ResponseStatus equivalent to result_status - :rtype: ResponseStatus - """ - ret_val : ResponseStatus - - match result_status: - case RequestResult.ResultStatus.SUCCESS: - ret_val = ResponseStatus.OK - case RequestResult.ResultStatus.FAILURE: - ret_val = ResponseStatus.BAD_REQUEST - case _: - ret_val = ResponseStatus.INTERNAL_ERR - - return ret_val - def __str__(self): """Stringify function for ResponseStatus objects. diff --git a/src/ogd/apis/utils/APIUtils.py b/src/ogd/apis/utils/APIUtils.py index 2e716aa..d85f64c 100644 --- a/src/ogd/apis/utils/APIUtils.py +++ b/src/ogd/apis/utils/APIUtils.py @@ -18,7 +18,6 @@ from ogd.common.storage.interfaces.MySQLInterface import MySQLInterface from ogd.common.storage.interfaces.BigQueryInterface import BigQueryInterface from ogd.common.configs.DataTableConfig import DataTableConfig -# from ogd.core.schemas.configs.ConfigSchema import ConfigSchema # import local files