openbb-core 1.2.2__tar.gz → 1.2.3__tar.gz

{openbb_core-1.2.2 → openbb_core-1.2.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: openbb-core
-Version: 1.2.2
-Summary: OpenBB package with core functionality
+Version: 1.2.3
+Summary: OpenBB package with core functionality.
 License: AGPL-3.0-only
 Author: OpenBB Team
 Author-email: hello@openbb.co
@@ -14,7 +14,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiohttp (>=3.9.5,<4.0.0)
-Requires-Dist: anyio (>=3.7.0,<4.0.0)
 Requires-Dist: fastapi (>=0.111.0,<0.112.0)
 Requires-Dist: html5lib (>=1.1,<2.0)
 Requires-Dist: importlib-metadata (>=6.8.0,<7.0.0)
@@ -24,8 +23,8 @@ Requires-Dist: pydantic (>=2.5.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-multipart (>=0.0.7,<0.0.8)
-Requires-Dist: requests (>=2.31.0,<3.0.0)
-Requires-Dist: ruff (>=0.1.6,<0.2.0)
+Requires-Dist: requests (>=2.32.1,<3.0.0)
+Requires-Dist: ruff (>=0.1.6,<=0.4.4)
 Requires-Dist: uuid7 (>=0.1.0,<0.2.0)
 Requires-Dist: uvicorn (>=0.24,<0.25)
 Requires-Dist: websockets (>=12.0,<13.0)

openbb_core-1.2.3/openbb_core/api/app_loader.py

@@ -0,0 +1,40 @@
+"""App loader module."""
+
+from typing import List, Optional
+
+from fastapi import APIRouter, FastAPI
+from openbb_core.api.exception_handlers import ExceptionHandlers
+from openbb_core.app.model.abstract.error import OpenBBError
+from openbb_core.app.router import RouterLoader
+from pydantic import ValidationError
+
+
+class AppLoader:
+    """App loader."""
+
+    @staticmethod
+    def add_routers(app: FastAPI, routers: List[Optional[APIRouter]], prefix: str):
+        """Add routers."""
+        for router in routers:
+            if router:
+                app.include_router(router=router, prefix=prefix)
+
+    @staticmethod
+    def add_openapi_tags(app: FastAPI):
+        """Add openapi tags."""
+        main_router = RouterLoader.from_extensions()
+        # Add tag data for each router in the main router
+        app.openapi_tags = [
+            {
+                "name": r,
+                "description": main_router.get_attr(r, "description"),
+            }
+            for r in main_router.routers
+        ]
+
+    @staticmethod
+    def add_exception_handlers(app: FastAPI):
+        """Add exception handlers."""
+        app.exception_handlers[Exception] = ExceptionHandlers.exception
+        app.exception_handlers[ValidationError] = ExceptionHandlers.validation
+        app.exception_handlers[OpenBBError] = ExceptionHandlers.openbb

openbb_core-1.2.3/openbb_core/api/exception_handlers.py

@@ -0,0 +1,69 @@
+"""Exception handlers module."""
+
+import logging
+from typing import Any
+
+from fastapi import Request
+from fastapi.responses import JSONResponse
+from openbb_core.app.model.abstract.error import OpenBBError
+from openbb_core.env import Env
+from pydantic import ValidationError
+
+logger = logging.getLogger("uvicorn.error")
+
+
+class ExceptionHandlers:
+    """Exception handlers."""
+
+    @staticmethod
+    async def _handle(exception: Exception, status_code: int, detail: Any):
+        """Exception handler."""
+        if Env().DEBUG_MODE:
+            raise exception
+        logger.error(exception)
+        return JSONResponse(
+            status_code=status_code,
+            content={
+                "detail": detail,
+            },
+        )
+
+    @staticmethod
+    async def exception(_: Request, error: Exception) -> JSONResponse:
+        """Exception handler for Base Exception."""
+        return await ExceptionHandlers._handle(
+            exception=error,
+            status_code=500,
+            detail="Unexpected error.",
+        )
+
+    @staticmethod
+    async def validation(request: Request, error: ValidationError):
+        """Exception handler for ValidationError."""
+        # Some validation is performed at Fetcher level.
+        # So we check if the validation error comes from a QueryParams class.
+        # And that it is in the request query params.
+        # If yes, we update the error location with query.
+        # If not, we handle it as a base Exception error.
+        query_params = dict(request.query_params)
+        errors = error.errors(include_url=False)
+        all_in_query = all(
+            loc in query_params for err in errors for loc in err.get("loc", ())
+        )
+        if "QueryParams" in error.title and all_in_query:
+            detail = [{**err, "loc": ("query",) + err.get("loc", ())} for err in errors]
+            return await ExceptionHandlers._handle(
+                exception=error,
+                status_code=422,
+                detail=detail,
+            )
+        return await ExceptionHandlers.exception(request, error)
+
+    @staticmethod
+    async def openbb(_: Request, error: OpenBBError):
+        """Exception handler for OpenBBError."""
+        return await ExceptionHandlers._handle(
+            exception=error,
+            status_code=400,
+            detail=str(error.original),
+        )

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/api/rest_api.py

@@ -3,14 +3,12 @@
 import logging
 from contextlib import asynccontextmanager
 
-from fastapi import FastAPI, Request
+from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import JSONResponse
 from openbb_core.api.app_loader import AppLoader
 from openbb_core.api.router.commands import router as router_commands
 from openbb_core.api.router.coverage import router as router_coverage
 from openbb_core.api.router.system import router as router_system
-from openbb_core.app.model.abstract.error import OpenBBError
 from openbb_core.app.service.auth_service import AuthService
 from openbb_core.app.service.system_service import SystemService
 from openbb_core.env import Env
@@ -73,8 +71,7 @@ app.add_middleware(
     allow_methods=system.api_settings.cors.allow_methods,
     allow_headers=system.api_settings.cors.allow_headers,
 )
-app.openapi_tags = AppLoader.get_openapi_tags()
-AppLoader.from_routers(
+AppLoader.add_routers(
     app=app,
     routers=(
         [AuthService().router, router_system, router_coverage, router_commands]
@@ -83,38 +80,8 @@ AppLoader.from_routers(
     ),
     prefix=system.api_settings.prefix,
 )
-
-
-@app.exception_handler(Exception)
-async def api_exception_handler(_: Request, exc: Exception):
-    """Exception handler for all other exceptions."""
-    if Env().DEBUG_MODE:
-        raise exc
-    logger.error(exc)
-    return JSONResponse(
-        status_code=404,
-        content={
-            "detail": str(exc),
-            "error_kind": exc.__class__.__name__,
-        },
-    )
-
-
-@app.exception_handler(OpenBBError)
-async def openbb_exception_handler(_: Request, exc: OpenBBError):
-    """Exception handler for OpenBB errors."""
-    if Env().DEBUG_MODE:
-        raise exc
-    logger.error(exc.original)
-    openbb_error = exc.original
-    status_code = 400 if "No results" in str(openbb_error) else 500
-    return JSONResponse(
-        status_code=status_code,
-        content={
-            "detail": str(openbb_error),
-            "error_kind": openbb_error.__class__.__name__,
-        },
-    )
+AppLoader.add_openapi_tags(app)
+AppLoader.add_exception_handlers(app)
 
 
 if __name__ == "__main__":

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/command_runner.py

@@ -79,7 +79,7 @@ class ParametersBuilder:
     def merge_args_and_kwargs(
         cls,
         func: Callable,
-        args: Tuple[Any],
+        args: Tuple[Any, ...],
         kwargs: Dict[str, Any],
     ) -> Dict[str, Any]:
         """Merge args and kwargs into a single dict."""
@@ -134,7 +134,7 @@ class ParametersBuilder:
 
         def _has_provider(kwargs: Dict[str, Any]) -> bool:
             """Check if the kwargs already have a provider."""
-            provider_choices = kwargs.get("provider_choices", None)
+            provider_choices = kwargs.get("provider_choices")
 
             if isinstance(provider_choices, dict):  # when in python
                 return provider_choices.get("provider", None) is not None
@@ -156,7 +156,7 @@ class ParametersBuilder:
 
             Either pick it from the user defaults or from the command coverage.
             """
-            cmd_cov_given_route = command_coverage.get(route, None)
+            cmd_cov_given_route = command_coverage.get(route)
             command_cov_provider = (
                 cmd_cov_given_route[0] if cmd_cov_given_route else None
             )
@@ -229,7 +229,8 @@ class ParametersBuilder:
         }
         # We allow extra fields to return with model with 'cc: CommandContext'
         config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
-        ValidationModel = create_model(func.__name__, __config__=config, **fields)  # type: ignore  # pylint: disable=C0103
+        # pylint: disable=C0103
+        ValidationModel = create_model(func.__name__, __config__=config, **fields)  # type: ignore
         # Validate and coerce
         model = ValidationModel(**kwargs)
         ParametersBuilder._warn_kwargs(
@@ -292,9 +293,7 @@ class StaticCommandRunner:
     ) -> OBBject:
         """Run a command and return the output."""
         obbject = await maybe_coroutine(func, **kwargs)
-        obbject.provider = getattr(
-            kwargs.get("provider_choices", None), "provider", None
-        )
+        obbject.provider = getattr(kwargs.get("provider_choices"), "provider", None)
         return obbject
 
     @classmethod
@@ -331,7 +330,7 @@ class StaticCommandRunner:
 
             if chart_params:
                 kwargs.update(chart_params)
-            obbject.charting.show(render=False, **kwargs)
+            obbject.charting.show(render=False, **kwargs)  # type: ignore[attr-defined]
         except Exception as e:  # pylint: disable=broad-exception-caught
             if Env().DEBUG_MODE:
                 raise OpenBBError(e) from e
@@ -386,9 +385,6 @@ class StaticCommandRunner:
                 obbject._standard_params = kwargs.get("standard_params", None)
                 if chart and obbject.results:
                     cls._chart(obbject, **kwargs)
-
-            except Exception as e:
-                raise OpenBBError(e) from e
             finally:
                 ls = LoggingService(system_settings, user_settings)
                 ls.log(

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/logs/logging_service.py

@@ -4,14 +4,13 @@ import json
 import logging
 from enum import Enum
 from types import TracebackType
-from typing import Any, Callable, Dict, Optional, Tuple, Type, Union, cast
+from typing import Any, Callable, Dict, Optional, Tuple, Type, Union
 
 from openbb_core.app.logs.formatters.formatter_with_exceptions import (
     FormatterWithExceptions,
 )
 from openbb_core.app.logs.handlers_manager import HandlersManager
 from openbb_core.app.logs.models.logging_settings import LoggingSettings
-from openbb_core.app.model.abstract.error import OpenBBError
 from openbb_core.app.model.abstract.singleton import SingletonMeta
 from openbb_core.app.model.system_settings import SystemSettings
 from openbb_core.app.model.user_settings import UserSettings
@@ -224,24 +223,22 @@ class LoggingService(metaclass=SingletonMeta):
             kwargs = {k: str(v)[:100] for k, v in kwargs.items()}
 
             # Get execution info
-            openbb_error = cast(
-                Optional[OpenBBError], exec_info[1] if exec_info else None
-            )
+            error = str(exec_info[1]) if exec_info and len(exec_info) > 1 else None
 
             # Construct message
-            message_label = "ERROR" if openbb_error else "CMD"
+            message_label = "ERROR" if error else "CMD"
             log_message = json.dumps(
                 {
                     "route": route,
                     "input": kwargs,
-                    "error": str(openbb_error.original) if openbb_error else None,
+                    "error": error,
                     "custom_headers": custom_headers,
                 },
                 default=to_jsonable_python,
             )
             log_message = f"{message_label}: {log_message}"
 
-            log_level = logger.error if openbb_error else logger.info
+            log_level = logger.error if error else logger.info
             log_level(
                 log_message,
                 extra={"func_name_override": func.__name__},

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/model/api_settings.py

@@ -31,7 +31,7 @@ class APISettings(BaseModel):
 
     version: str = "1"
     title: str = "OpenBB Platform API"
-    description: str = "This is the OpenBB Platform API."
+    description: str = "Investment research for everyone, anywhere."
     terms_of_service: str = "http://example.com/terms/"
     contact_name: str = "OpenBB Team"
     contact_url: str = "https://openbb.co"

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/model/credentials.py

@@ -61,7 +61,7 @@ class CredentialsLoader:
     def from_obbject(self) -> None:
         """Load credentials from OBBject extensions."""
         self.credentials["obbject"] = set()
-        for name, entry in ExtensionLoader().obbject_objects.items():
+        for name, entry in ExtensionLoader().obbject_objects.items():  # type: ignore[attr-defined]
             try:
                 for c in entry.credentials:
                     self.credentials["obbject"].add(c)
@@ -116,3 +116,7 @@ class Credentials(_Credentials):  # type: ignore
                 [f"{k}: {v}" for k, v in sorted(self.model_dump(mode="json").items())]
             )
         )
+
+    def update(self, incoming: "Credentials"):
+        """Update current credentials."""
+        self.__dict__.update(incoming.model_dump(exclude_none=True))

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/router.py

@@ -644,7 +644,7 @@ class RouterLoader:
         """Load routes from extensions."""
         router = Router()
 
-        for name, entry in ExtensionLoader().core_objects.items():
+        for name, entry in ExtensionLoader().core_objects.items():  # type: ignore[attr-defined]
             try:
                 router.include_router(router=entry, prefix=f"/{name}")
             except Exception as e:

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/service/user_service.py

@@ -50,15 +50,6 @@ class UserService(metaclass=SingletonMeta):
         )
         path.write_text(user_settings_json, encoding="utf-8")
 
-    @classmethod
-    def update_default(cls, user_settings: UserSettings) -> UserSettings:
-        """Update default user settings."""
-        d1 = cls.read_default_user_settings().model_dump()
-        d2 = user_settings.model_dump() if user_settings else {}
-        updated = cls._merge_dicts([d1, d2])
-
-        return UserSettings.model_validate(updated)
-
     @staticmethod
     def _merge_dicts(list_of_dicts: List[Dict[str, Any]]) -> Dict[str, Any]:
         """Merge a list of dictionaries."""

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/static/account.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
     from openbb_core.app.static.app_factory import BaseApp
 
 
-class Account:
+class Account:  # noqa: D205, D400
     """/account
     login
     logout
@@ -123,8 +123,8 @@ class Account:
         """
         self._hub_service = self._create_hub_service(email, password, pat)
         incoming = self._hub_service.pull()
-        updated: UserSettings = UserService.update_default(incoming)
-        self._base_app._command_runner.user_settings = updated
+        self._base_app.user.profile = incoming.profile
+        self._base_app.user.credentials.update(incoming.credentials)
         if remember_me:
             Path(self._openbb_directory).mkdir(parents=False, exist_ok=True)
             session_file = Path(self._openbb_directory, self.SESSION_FILE)
@@ -185,10 +185,8 @@ class Account:
             )
         else:
             incoming = self._hub_service.pull()
-            updated: UserSettings = UserService.update_default(incoming)
-            updated.id = self._base_app._command_runner.user_settings.id
-            self._base_app._command_runner.user_settings = updated
-
+            self._base_app.user.profile = incoming.profile
+            self._base_app.user.credentials.update(incoming.credentials)
         if return_settings:
             return self._base_app._command_runner.user_settings
         return None

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/static/coverage.py

@@ -11,16 +11,13 @@ if TYPE_CHECKING:
     from openbb_core.app.static.app_factory import BaseApp
 
 
-class Coverage:
-    """Coverage class.
-
-    /coverage
-
-        providers
-        commands
-        command_model
-        command_schemas
-        reference
+class Coverage:  # noqa: D205, D400
+    """/coverage
+    providers
+    commands
+    command_model
+    command_schemas
+    reference
     """
 
     def __init__(self, app: "BaseApp"):

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/static/package_builder.py

@@ -190,7 +190,7 @@ class PackageBuilder:
                 "openbb": VERSION.replace("dev", ""),
                 "info": {
                     "title": "OpenBB Platform (Python)",
-                    "description": "This is the OpenBB Platform (Python).",
+                    "description": "Investment research for everyone, anywhere.",
                     "core": CORE_VERSION.replace("dev", ""),
                     "extensions": ext_map,
                 },
@@ -1048,7 +1048,7 @@ class DocstringGenerator:
         cls,
         model_name: str,
         summary: str,
-        explicit_params: dict,
+        explicit_params: Dict[str, Parameter],
         kwarg_params: dict,
         returns: Dict[str, FieldInfo],
         results_type: str,
@@ -1071,8 +1071,10 @@ class DocstringGenerator:
             description = description.replace("\n", f"\n{create_indent(2)}")
             return description
 
-        def get_param_info(parameter: Parameter) -> Tuple[str, str]:
+        def get_param_info(parameter: Optional[Parameter]) -> Tuple[str, str]:
             """Get the parameter info."""
+            if not parameter:
+                return "", ""
             annotation = getattr(parameter, "_annotation", None)
             if isinstance(annotation, _AnnotatedAlias):
                 args = getattr(annotation, "__args__", []) if annotation else []
@@ -1123,7 +1125,7 @@ class DocstringGenerator:
             docstring += "\n"
             docstring += f"{create_indent(2)}Returns\n"
             docstring += f"{create_indent(2)}-------\n"
-            providers, _ = get_param_info(explicit_params.get("provider", None))
+            providers, _ = get_param_info(explicit_params.get("provider"))
             docstring += cls.get_OBBject_description(results_type, providers)
 
             # Schema
@@ -1300,7 +1302,7 @@ class PathHandler:
     @staticmethod
     def get_route(path: str, route_map: Dict[str, BaseRoute]):
         """Get the route from the path."""
-        return route_map.get(path, None)
+        return route_map.get(path)
 
     @staticmethod
     def get_child_path_list(path: str, path_list: List[str]) -> List[str]:

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/app/static/utils/decorators.py

@@ -47,8 +47,7 @@ def exception_handler(func: Callable[P, R]) -> Callable[P, R]:
     def wrapper(*f_args, **f_kwargs):
         try:
             return func(*f_args, **f_kwargs)
-        except (ValidationError, Exception) as e:
-            # If the DEBUG_MODE is enabled, raise the exception with complete traceback
+        except (ValidationError, OpenBBError, Exception) as e:
             if Env().DEBUG_MODE:
                 raise
 
@@ -60,34 +59,27 @@ def exception_handler(func: Callable[P, R]) -> Callable[P, R]:
 
             if isinstance(e, ValidationError):
                 error_list = []
-
-                validation_error = f"{e.error_count()} validations errors in {e.title}"
-                for error in e.errors():
-                    arg = ".".join(map(str, error["loc"]))
-                    arg_error = f"Arg {arg} ->\n"
-                    error_details = (
-                        f"{error['msg']} "
-                        f"[validation_error_type={error['type']}, "
-                        f"input_type={type(error['input']).__name__}, "
-                        f"input_value={error['input']}]\n"
-                    )
-                    url = error.get("url")
-                    error_info = (
-                        f"    For further information visit {url}\n" if url else ""
+                validation_error = f"{e.error_count()} validations error(s)"
+                for err in e.errors(include_url=False):
+                    loc = ".".join(
+                        [
+                            str(i)
+                            for i in err.get("loc", ())
+                            if i not in ("standard_params", "extra_params")
+                        ]
                     )
-                    error_list.append(arg_error + error_details + error_info)
-
+                    _input = err.get("input", "")
+                    msg = err.get("msg", "")
+                    error_list.append(f"[Arg] {loc} -> input: {_input} -> {msg}")
                 error_list.insert(0, validation_error)
                 error_str = "\n".join(error_list)
-
-                raise OpenBBError(
-                    f"\nType -> ValidationError \n\nDetails -> {error_str}"
-                ).with_traceback(tb) from None
-
-            # If the error is not a ValidationError, then it is a generic exception
-            error_type = getattr(e, "original", e).__class__.__name__
-            raise OpenBBError(
-                f"\nType -> {error_type}\n\nDetail -> {str(e)}"
-            ).with_traceback(tb) from None
+                raise OpenBBError(f"\n[Error] -> {error_str}").with_traceback(
+                    tb
+                ) from None
+            if isinstance(e, OpenBBError):
+                raise OpenBBError(f"\n[Error] -> {str(e)}").with_traceback(tb) from None
+            raise OpenBBError("\n[Error] -> Unexpected error.").with_traceback(
+                tb
+            ) from None
 
     return wrapper

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/provider/registry.py

@@ -41,7 +41,7 @@ class RegistryLoader:
         """Load providers from entry points."""
         registry = Registry()
 
-        for name, entry in ExtensionLoader().provider_objects.items():
+        for name, entry in ExtensionLoader().provider_objects.items():  # type: ignore[attr-defined]
             try:
                 registry.include_provider(provider=entry)
             except Exception as e:

{openbb_core-1.2.2 → openbb_core-1.2.3}/openbb_core/provider/standard_models/balance_of_payments.py

@@ -15,6 +15,85 @@ class BalanceOfPaymentsQueryParams(QueryParams):
     """Balance Of Payments Query."""
 
 
+class BP6BopUsdData(Data):
+    """OECD BP6 Balance of Payments Items, in USD."""
+
+    period: dateType = Field(
+        default=None,
+        description="The date representing the beginning of the reporting period.",
+    )
+    balance_percent_of_gdp: Optional[float] = Field(
+        default=None,
+        description="Current Account Balance as Percent of GDP",
+        json_schema_extra={"x-unit_measurement": "percent", "x-frontend_multiply": 100},
+    )
+    balance_total: Optional[float] = Field(
+        default=None, description="Current Account Total Balance (USD)"
+    )
+    balance_total_services: Optional[float] = Field(
+        default=None, description="Current Account Total Services Balance (USD)"
+    )
+    balance_total_secondary_income: Optional[float] = Field(
+        default=None, description="Current Account Total Secondary Income Balance (USD)"
+    )
+    balance_total_goods: Optional[float] = Field(
+        default=None, description="Current Account Total Goods Balance (USD)"
+    )
+    balance_total_primary_income: Optional[float] = Field(
+        default=None, description="Current Account Total Primary Income Balance (USD)"
+    )
+    credits_services_percent_of_goods_and_services: Optional[float] = Field(
+        default=None,
+        description="Current Account Credits Services as Percent of Goods and Services",
+        json_schema_extra={"x-unit_measurement": "percent", "x-frontend_multiply": 100},
+    )
+    credits_services_percent_of_current_account: Optional[float] = Field(
+        default=None,
+        description="Current Account Credits Services as Percent of Current Account",
+        json_schema_extra={"x-unit_measurement": "percent", "x-frontend_multiply": 100},
+    )
+    credits_total_services: Optional[float] = Field(
+        default=None, description="Current Account Credits Total Services (USD)"
+    )
+    credits_total_goods: Optional[float] = Field(
+        default=None, description="Current Account Credits Total Goods (USD)"
+    )
+    credits_total_primary_income: Optional[float] = Field(
+        default=None, description="Current Account Credits Total Primary Income (USD)"
+    )
+    credits_total_secondary_income: Optional[float] = Field(
+        default=None, description="Current Account Credits Total Secondary Income (USD)"
+    )
+    credits_total: Optional[float] = Field(
+        default=None, description="Current Account Credits Total (USD)"
+    )
+    debits_services_percent_of_goods_and_services: Optional[float] = Field(
+        default=None,
+        description="Current Account Debits Services as Percent of Goods and Services",
+        json_schema_extra={"x-unit_measurement": "percent", "x-frontend_multiply": 100},
+    )
+    debits_services_percent_of_current_account: Optional[float] = Field(
+        default=None,
+        description="Current Account Debits Services as Percent of Current Account",
+        json_schema_extra={"x-unit_measurement": "percent", "x-frontend_multiply": 100},
+    )
+    debits_total_services: Optional[float] = Field(
+        default=None, description="Current Account Debits Total Services (USD)"
+    )
+    debits_total_goods: Optional[float] = Field(
+        default=None, description="Current Account Debits Total Goods (USD)"
+    )
+    debits_total_primary_income: Optional[float] = Field(
+        default=None, description="Current Account Debits Total Primary Income (USD)"
+    )
+    debits_total: Optional[float] = Field(
+        default=None, description="Current Account Debits Total (USD)"
+    )
+    debits_total_secondary_income: Optional[float] = Field(
+        default=None, description="Current Account Debits Total Secondary Income (USD)"
+    )
+
+
 class ECBMain(Data):
     """ECB Main Balance of Payments Items."""