Merge branch 'develop' into feature/conda-distribution

OpenBB-finance · Aug 19, 2024 · 791e4ec · 791e4ec
2 parents acbf1c9 + 8f7555b
commit 791e4ec
Show file tree

Hide file tree

Showing 56 changed files with 30,734 additions and 19,007 deletions.
diff --git a/cli/poetry.lock b/cli/poetry.lock
diff --git a/openbb_platform/core/openbb_core/api/router/commands.py b/openbb_platform/core/openbb_core/api/router/commands.py
@@ -154,7 +154,7 @@ def exclude_fields_from_api(key: str, value: Any):
 
         # if it's a model with nested fields
         elif is_model(type_):
-            for field_name, field in type_.__fields__.items():
+            for field_name, field in type_.model_fields.items():
                 extra = getattr(field, "json_schema_extra", None)
                 if (
                     extra

diff --git a/openbb_platform/core/openbb_core/provider/abstract/fetcher.py b/openbb_platform/core/openbb_core/provider/abstract/fetcher.py
@@ -167,9 +167,9 @@ def test(
         if is_list:
             assert all(
                 field in data[0]
-                for field in cls.data_type.__fields__
+                for field in cls.data_type.model_fields
                 if field in data[0]
-            ), f"Data must have the correct fields. Expected: {cls.data_type.__fields__} Got: {data[0].__dict__}"
+            ), f"Data must have the correct fields. Expected: {cls.data_type.model_fields} Got: {data[0].__dict__}"
             # This makes sure that the data is not transformed yet so that the
             # pipeline is implemented correctly. We can remove this assertion if we
             # want to be less strict.
@@ -178,8 +178,8 @@ def test(
             ), f"Data must not be transformed yet. Expected: {cls.data_type} Got: {type(data[0])}"
         else:
             assert all(
-                field in data for field in cls.data_type.__fields__ if field in data
-            ), f"Data must have the correct fields. Expected: {cls.data_type.__fields__} Got: {data.__dict__}"
+                field in data for field in cls.data_type.model_fields if field in data
+            ), f"Data must have the correct fields. Expected: {cls.data_type.model_fields} Got: {data.__dict__}"
             assert (
                 issubclass(type(data), cls.data_type) is False
             ), f"Data must not be transformed yet. Expected: {cls.data_type} Got: {type(data)}"
@@ -200,10 +200,12 @@ def test(
                 and return_type_args.__origin__ is dict
             )
             if return_type_is_dict:
-                return_type_fields = return_type_args.__args__[1].__args__[0].__fields__
+                return_type_fields = (
+                    return_type_args.__args__[1].__args__[0].model_fields
+                )
                 return_type = return_type_args.__args__[1].__args__[0]
             else:
-                return_type_fields = return_type_args.__fields__
+                return_type_fields = return_type_args.model_fields
                 return_type = return_type_args
 
             assert len(transformed_data) > 0, "Transformed data must not be empty."  # type: ignore
@@ -220,8 +222,8 @@ def test(
         else:
             assert all(
                 field in transformed_data.__dict__
-                for field in cls.return_type.__fields__
-            ), f"Transformed data must have the correct fields. Expected: {cls.return_type.__fields__} Got: {transformed_data.__dict__}"
+                for field in cls.return_type.model_fields
+            ), f"Transformed data must have the correct fields. Expected: {cls.return_type.model_fields} Got: {transformed_data.__dict__}"
             assert issubclass(
                 type(transformed_data), cls.data_type
             ), f"Transformed data must be of the correct type. Expected: {cls.data_type} Got: {type(transformed_data)}"

diff --git a/openbb_platform/core/poetry.lock b/openbb_platform/core/poetry.lock
diff --git a/openbb_platform/core/pyproject.toml b/openbb_platform/core/pyproject.toml
@@ -21,7 +21,7 @@ pydantic = "^2.5.1"
 requests = "^2.32.1"
 importlib-metadata = "^6.8.0"
 python-dotenv = "^1.0.0"
-aiohttp = "^3.9.5"
+aiohttp = "^3.10.2"
 ruff = ">=0.1.6"              # Needed here to lint generated code
 pyjwt = "^2.8.0"
 

diff --git a/openbb_platform/extensions/commodity/poetry.lock b/openbb_platform/extensions/commodity/poetry.lock
diff --git a/openbb_platform/extensions/crypto/poetry.lock b/openbb_platform/extensions/crypto/poetry.lock
diff --git a/openbb_platform/extensions/currency/poetry.lock b/openbb_platform/extensions/currency/poetry.lock
diff --git a/openbb_platform/extensions/derivatives/openbb_derivatives/derivatives_views.py b/openbb_platform/extensions/derivatives/openbb_derivatives/derivatives_views.py
@@ -107,9 +107,7 @@ def derivatives_futures_curve(  # noqa: PLR0912
 
         provider = kwargs.get("provider", "")
 
-        df["expiration"] = to_datetime(df["expiration"], errors="ignore").dt.strftime(
-            "%b-%Y"
-        )
+        df["expiration"] = df["expiration"].apply(to_datetime).dt.strftime("%b-%Y")
 
         if (
             provider == "cboe"

diff --git a/openbb_platform/extensions/derivatives/poetry.lock b/openbb_platform/extensions/derivatives/poetry.lock
diff --git a/openbb_platform/extensions/devtools/poetry.lock b/openbb_platform/extensions/devtools/poetry.lock
diff --git a/openbb_platform/extensions/econometrics/poetry.lock b/openbb_platform/extensions/econometrics/poetry.lock
diff --git a/openbb_platform/extensions/economy/poetry.lock b/openbb_platform/extensions/economy/poetry.lock
diff --git a/openbb_platform/extensions/equity/poetry.lock b/openbb_platform/extensions/equity/poetry.lock
diff --git a/openbb_platform/extensions/etf/poetry.lock b/openbb_platform/extensions/etf/poetry.lock
diff --git a/openbb_platform/extensions/fixedincome/poetry.lock b/openbb_platform/extensions/fixedincome/poetry.lock
diff --git a/openbb_platform/extensions/index/poetry.lock b/openbb_platform/extensions/index/poetry.lock
diff --git a/openbb_platform/extensions/news/poetry.lock b/openbb_platform/extensions/news/poetry.lock
diff --git a/openbb_platform/extensions/quantitative/poetry.lock b/openbb_platform/extensions/quantitative/poetry.lock
diff --git a/openbb_platform/extensions/regulators/poetry.lock b/openbb_platform/extensions/regulators/poetry.lock
diff --git a/openbb_platform/extensions/technical/poetry.lock b/openbb_platform/extensions/technical/poetry.lock
diff --git a/openbb_platform/obbject_extensions/charting/poetry.lock b/openbb_platform/obbject_extensions/charting/poetry.lock
diff --git a/openbb_platform/openbb/assets/reference.json b/openbb_platform/openbb/assets/reference.json
@@ -35717,15 +35717,24 @@
                         "description": "The source of the news article.",
                         "default": null,
                         "optional": true,
-                        "choices": null
+                        "choices": [
+                            "yahoo",
+                            "moody",
+                            "moody_us_news",
+                            "moody_us_press_releases"
+                        ]
                     },
                     {
                         "name": "sentiment",
                         "type": "Literal['positive', 'neutral', 'negative']",
                         "description": "Return news only from this source.",
                         "default": null,
                         "optional": true,
-                        "choices": null
+                        "choices": [
+                            "positive",
+                            "neutral",
+                            "negative"
+                        ]
                     },
                     {
                         "name": "language",
@@ -35791,7 +35800,10 @@
                         "description": "Sort order of the articles.",
                         "default": "desc",
                         "optional": true,
-                        "choices": null
+                        "choices": [
+                            "asc",
+                            "desc"
+                        ]
                     }
                 ],
                 "tiingo": [

diff --git a/openbb_platform/openbb/package/news.py b/openbb_platform/openbb/package/news.py
@@ -77,7 +77,7 @@ def company(
             Number of seconds since the news was published. (provider: benzinga)
         sort : Literal['id', 'created', 'updated']
             Key to sort the news by. (provider: benzinga)
-        order : Optional[Literal['asc', 'desc']]
+        order : Literal['asc', 'desc']
             Order to sort the news by. (provider: benzinga);
             Sort order of the articles. (provider: polygon)
         isin : Optional[str]
@@ -240,7 +240,30 @@ def company(
                         "polygon": {"multiple_items_allowed": True, "choices": None},
                         "tiingo": {"multiple_items_allowed": True, "choices": None},
                         "yfinance": {"multiple_items_allowed": True, "choices": None},
-                    }
+                    },
+                    "order": {
+                        "polygon": {
+                            "multiple_items_allowed": False,
+                            "choices": ["asc", "desc"],
+                        }
+                    },
+                    "source": {
+                        "intrinio": {
+                            "multiple_items_allowed": False,
+                            "choices": [
+                                "yahoo",
+                                "moody",
+                                "moody_us_news",
+                                "moody_us_press_releases",
+                            ],
+                        }
+                    },
+                    "sentiment": {
+                        "intrinio": {
+                            "multiple_items_allowed": False,
+                            "choices": ["positive", "neutral", "negative"],
+                        }
+                    },
                 },
             )
         )