economy.calendar nasdaq

openbb_platform/extensions/economy/integration/test_economy_api.py

@@ -496,14 +496,21 @@ def test_economy_gdpforecast(params, headers):
     [
         (
             {
+                "provider": "quandl",
+                "start_date": "2023-05-01",
+                "end_date": "2023-05-10",
+                "country": "Spain",
+            }
+        ),
+        (
+            {
+                "importance": "high",
                 "provider": "tradingeconomics",
                 "start_date": "2023-01-01",
                 "end_date": "2023-06-06",
-                "country": "portugal",
-                "group": "gdp",
-                "importance": "Low",
+                "country": "United States",
             }
-        )
+        ),
     ],
 )
 @pytest.mark.integration

openbb_platform/extensions/economy/integration/test_economy_python.py

@@ -435,10 +435,19 @@ def test_economy_gdpforecast(params, obb):
     [
         (
             {
-                "start_date": "2023-01-01",
-                "end_date": "2023-06-06",
-                "country": "portugal",
-                "importance": "Low",
+                "provider": "quandl",
+                "start_date": "2023-10-01",
+                "end_date": "2023-10-20",
+                "country": "France",
+            }
+        ),
+        (
+            {
+                "importance": "high",
+                "provider": "tradingeconomics",
+                "start_date": "2023-08-01",
+                "end_date": "2023-09-06",
+                "country": "Germany",
                 "group": "gdp",
             }
         ),

openbb_platform/extensions/economy/openbb_economy/economy_router.py

@@ -204,5 +204,5 @@ def econcal(
     standard_params: StandardParams,
     extra_params: ExtraParams,
 ) -> OBBject[BaseModel]:
-    """GDP Data."""
+    """Economic Calendar Data."""
     return OBBject(results=Query(**locals()).execute())

openbb_platform/openbb/package/economy.py

@@ -1,15 +1,27 @@
 ### THIS FILE IS AUTO-GENERATED. DO NOT EDIT. ###
 
+from openbb_core.app.static.container import Container
+from openbb_core.app.model.obbject import OBBject
+from openbb_core.app.model.custom_parameter import OpenBBCustomParameter
+import openbb_provider
+import pandas
 import datetime
-from typing import List, Literal, Union
-
+import pydantic
+from pydantic import BaseModel
+from inspect import Parameter
+import typing
+from typing import List, Dict, Union, Optional, Literal
+from annotated_types import Ge, Le, Gt, Lt
 import typing_extensions
-from openbb_core.app.model.custom_parameter import OpenBBCustomParameter
-from openbb_core.app.model.obbject import OBBject
-from openbb_core.app.static.container import Container
+from openbb_core.app.utils import df_to_basemodel
 from openbb_core.app.static.decorators import validate
+
 from openbb_core.app.static.filters import filter_inputs
+
 from openbb_provider.abstract.data import Data
+import openbb_core.app.model.command_context
+import openbb_core.app.model.obbject
+import types
 
 
 class ROUTER_economy(Container):
@@ -545,65 +557,38 @@ def econcal(
                 description="End date of the data, in YYYY-MM-DD format."
             ),
         ] = None,
-        importance: typing_extensions.Annotated[
-            Literal[1, 2, 3],
-            OpenBBCustomParameter(
-                description="Importance of the event. (1-Low, 2-Medium, 3-High)"
-            ),
-        ] = 3,
-        group: typing_extensions.Annotated[
-            Union[
-                Literal[
-                    "interest rate",
-                    "inflation",
-                    "bonds",
-                    "consumer",
-                    "gdp",
-                    "government",
-                    "housing",
-                    "labour",
-                    "markets",
-                    "money",
-                    "prices",
-                    "trade",
-                    "business",
-                ],
-                None,
-            ],
-            OpenBBCustomParameter(description="Grouping of events"),
-        ] = None,
         country: typing_extensions.Annotated[
             Union[List[str], str, None],
             OpenBBCustomParameter(description="Country of the event"),
         ] = None,
-        provider: Union[Literal["tradingeconomics"], None] = None,
+        provider: Union[Literal["quandl", "tradingeconomics"], None] = None,
         **kwargs
     ) -> OBBject[List[Data]]:
-        """GDP Data.
+        """Economic Calendar Data.
 
         Parameters
         ----------
         start_date : Union[datetime.date, None]
             Start date of the data, in YYYY-MM-DD format.
         end_date : Union[datetime.date, None]
             End date of the data, in YYYY-MM-DD format.
-        importance : Literal[1, 2, 3]
-            Importance of the event. (1-Low, 2-Medium, 3-High)
-        group : Union[Literal['interest rate', 'inflation', 'bonds', 'consumer', ...
-            Grouping of events
         country : Union[List[str], str, None]
             Country of the event
-        provider : Union[Literal['tradingeconomics'], None]
+        provider : Union[Literal['quandl', 'tradingeconomics'], None]
             The provider to use for the query, by default None.
-            If None, the provider specified in defaults is selected or 'tradingeconomics' if there is
+            If None, the provider specified in defaults is selected or 'quandl' if there is
             no default.
+        importance : Literal['low', 'medium', 'high']
+            Importance of the event. (provider: tradingeconomics)
+        group : Optional[Union[Literal['interest rate', 'inflation', 'bonds', 'consumer', 'gdp', 'government', 'housing', 'labour', 'markets', 'money', 'prices', 'trade', 'business']]]
+            Grouping of events (provider: tradingeconomics)
 
         Returns
         -------
         OBBject
             results : Union[List[EconomicCalendar]]
                 Serializable results.
-            provider : Union[Literal['tradingeconomics'], None]
+            provider : Union[Literal['quandl', 'tradingeconomics'], None]
                 Provider name.
             warnings : Optional[List[Warning_]]
                 List of warnings.
@@ -618,37 +603,41 @@ def econcal(
             The date of the data.
         country : Optional[Union[str]]
             Country of event.
-        category : Optional[Union[str]]
-            Category of event.
         event : Optional[Union[str]]
             Event name.
-        reference : Optional[Union[str]]
-            Abbreviated period for which released data refers to.
-        source : Optional[Union[str]]
-            Source of the data.
-        sourceurl : Optional[Union[str]]
-            Source URL.
         actual : Optional[Union[str]]
             Latest released value.
         previous : Optional[Union[str]]
             Value for the previous period after the revision (if revision is applicable).
         consensus : Optional[Union[str]]
             Average forecast among a representative group of economists.
+        time : Optional[Union[str]]
+            GMT of release (in HH:MM format). (provider: quandl)
+        description : Optional[Union[str]]
+            Event description. (provider: quandl)
+        category : Optional[Union[str]]
+            Category of event. (provider: tradingeconomics)
+        reference : Optional[Union[str]]
+            Abbreviated period for which released data refers to. (provider: tradingeconomics)
+        source : Optional[Union[str]]
+            Source of the data. (provider: tradingeconomics)
+        sourceurl : Optional[Union[str]]
+            Source URL. (provider: tradingeconomics)
         forecast : Optional[Union[str]]
-            Trading Economics projections
+            Trading Economics projections (provider: tradingeconomics)
         url : Optional[Union[str]]
-            Trading Economics URL
-        importance : Optional[Union[Literal[0, 1, 2, 3]]]
-            Importance of the event. 1-Low, 2-Medium, 3-High
+            Trading Economics URL (provider: tradingeconomics)
+        importance : Optional[Union[Literal['Low', 'Medium', 'High']]]
+            Importance of the event. (provider: tradingeconomics)
         currency : Optional[Union[str]]
-            Currency of the data.
+            Currency of the data. (provider: tradingeconomics)
         unit : Optional[Union[str]]
-            Unit of the data.
+            Unit of the data. (provider: tradingeconomics)
 
         Example
         -------
         >>> from openbb import obb
-        >>> obb.economy.econcal(importance=3)
+        >>> obb.economy.econcal()
         """  # noqa: E501
 
         inputs = filter_inputs(
@@ -658,8 +647,6 @@ def econcal(
             standard_params={
                 "start_date": start_date,
                 "end_date": end_date,
-                "importance": importance,
-                "group": group,
                 "country": country,
             },
             extra_params=kwargs,

openbb_platform/platform/provider/openbb_provider/standard_models/economic_calendar.py

@@ -5,7 +5,7 @@
     date as dateType,
     datetime,
 )
-from typing import List, Literal, Optional, Union
+from typing import List, Optional, Union
 
 from pydantic import Field
 
@@ -25,27 +25,6 @@ class EconomicCalendarQueryParams(QueryParams):
         default=None,
         description=QUERY_DESCRIPTIONS.get("end_date", ""),
     )
-    importance: Literal[1, 2, 3] = Field(
-        default=3,
-        description="Importance of the event. (1-Low, 2-Medium, 3-High)",
-    )
-    group: Optional[
-        Literal[
-            "interest rate",
-            "inflation",
-            "bonds",
-            "consumer",
-            "gdp",
-            "government",
-            "housing",
-            "labour",
-            "markets",
-            "money",
-            "prices",
-            "trade",
-            "business",
-        ]
-    ] = Field(default=None, description="Grouping of events")
     # TODO: Probably want to figure out the list we can use.
     country: Optional[Union[str, List[str]]] = Field(
         default=None,
@@ -60,14 +39,7 @@ class EconomicCalendarData(Data):
         default=None, description=DATA_DESCRIPTIONS.get("date", "")
     )
     country: Optional[str] = Field(default=None, description="Country of event.")
-    category: Optional[str] = Field(default=None, description="Category of event.")
     event: Optional[str] = Field(default=None, description="Event name.")
-    reference: Optional[str] = Field(
-        default=None,
-        description="Abbreviated period for which released data refers to.",
-    )
-    source: Optional[str] = Field(default=None, description="Source of the data.")
-    sourceurl: Optional[str] = Field(default=None, description="Source URL.")
     actual: Optional[str] = Field(default=None, description="Latest released value.")
     previous: Optional[str] = Field(
         default=None,
@@ -77,12 +49,3 @@ class EconomicCalendarData(Data):
         default=None,
         description="Average forecast among a representative group of economists.",
     )
-    forecast: Optional[str] = Field(
-        default=None, description="Trading Economics projections"
-    )
-    url: Optional[str] = Field(default=None, description="Trading Economics URL")
-    importance: Optional[Literal[0, 1, 2, 3]] = Field(
-        default=None, description="Importance of the event. 1-Low, 2-Medium, 3-High"
-    )
-    currency: Optional[str] = Field(default=None, description="Currency of the data.")
-    unit: Optional[str] = Field(default=None, description="Unit of the data.")

openbb_platform/providers/quandl/openbb_quandl/__init__.py

@@ -2,6 +2,7 @@
 from openbb_provider.abstract.provider import Provider
 from openbb_quandl.models.cot import QuandlCotFetcher
 from openbb_quandl.models.cot_search import QuandlCotSearchFetcher
+from openbb_quandl.models.economic_calendar import QuandlEconomicCalendarFetcher
 from openbb_quandl.models.sp500_multiples import QuandlSP500MultiplesFetcher
 
 quandl_provider = Provider(
@@ -18,5 +19,6 @@
         "SP500Multiples": QuandlSP500MultiplesFetcher,
         "COT": QuandlCotFetcher,
         "COTSearch": QuandlCotSearchFetcher,
+        "EconomicCalendar": QuandlEconomicCalendarFetcher,
     },
 )