kensho-kfinance 2.0.1__tar.gz → 2.2.2__tar.gz

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/.gitignore

@@ -4,6 +4,7 @@ __pycache__/
 *$py.class
 
 # Distribution / packaging
+.python-version
 .Python
 build/
 develop-eggs/

{kensho_kfinance-2.0.1/kensho_kfinance.egg-info → kensho_kfinance-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kensho-kfinance
-Version: 2.0.1
+Version: 2.2.2
 Summary: Python CLI for kFinance
 Author-email: Luke Brown <luke.brown@kensho.com>, Michelle Keoy <michelle.keoy@kensho.com>, Keith Page <keith.page@kensho.com>, Matthew Rosen <matthew.rosen@kensho.com>, Nick Roshdieh <nick.roshdieh@kensho.com>
 Project-URL: source, https://github.com/kensho-technologies/kfinance
@@ -12,6 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.md
+Requires-Dist: cachetools<6,>=5.5
 Requires-Dist: langchain-core>=0.3.15
 Requires-Dist: langchain-google-genai<3,>=2.1.0
 Requires-Dist: numpy>=1.22.4
@@ -27,12 +28,17 @@ Requires-Dist: requests<3,>=2.22.0
 Requires-Dist: urllib3>=1.21.1
 Provides-Extra: dev
 Requires-Dist: coverage<8,>=7.6.10; extra == "dev"
+Requires-Dist: ipykernel<7,>=6.29; extra == "dev"
 Requires-Dist: mypy<2,>=1.15.0; extra == "dev"
+Requires-Dist: nbconvert<8,>=7.16; extra == "dev"
+Requires-Dist: nbformat<6,>5.10; extra == "dev"
+Requires-Dist: nbqa<2,>1.9; extra == "dev"
 Requires-Dist: pytest<7,>=6.1.2; extra == "dev"
 Requires-Dist: pytest-cov<7,>=6.0.0; extra == "dev"
 Requires-Dist: requests_mock<2,>=1.12; extra == "dev"
 Requires-Dist: ruff<1,>=0.9.4; extra == "dev"
 Requires-Dist: time_machine<3,>=2.1; extra == "dev"
+Requires-Dist: types-cachetools<6,>=5.5; extra == "dev"
 Dynamic: license-file
 
 # kFinance
@@ -55,6 +61,8 @@ To receive access, please email [S&P Global Market Intelligence](market.intellig
 
 Once access is obtained, get started using the [Authentication Guide](https://docs.kensho.com/llmreadyapi/kf-authentication) and [Usage Guide](https://docs.kensho.com/llmreadyapi/usage).
 
+We also provide an [interactive notebook](usage_examples.ipynb) that demonstrates some usage examples.
+
 # Versioning
 The kFinance uses semantic versioning (major, minor, patch). 
 To bump the version, add a new entry in [CHANGELOG.md](kfinance%2FCHANGELOG.md). 

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/README.md

@@ -18,6 +18,8 @@ To receive access, please email [S&P Global Market Intelligence](market.intellig
 
 Once access is obtained, get started using the [Authentication Guide](https://docs.kensho.com/llmreadyapi/kf-authentication) and [Usage Guide](https://docs.kensho.com/llmreadyapi/usage).
 
+We also provide an [interactive notebook](usage_examples.ipynb) that demonstrates some usage examples.
+
 # Versioning
 The kFinance uses semantic versioning (major, minor, patch). 
 To bump the version, add a new entry in [CHANGELOG.md](kfinance%2FCHANGELOG.md). 

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/justfile

@@ -24,6 +24,7 @@ lint *args:
     # See https://docs.astral.sh/ruff/formatter/#sorting-imports
     python -m ruff --config pyproject.toml check kfinance --fix {{args}}
     python -m ruff --config pyproject.toml format kfinance {{args}}
+    nbqa mypy usage_examples.ipynb
 
 alias t := unit-test
 # Run unit tests. Use args for optional settings

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2/kensho_kfinance.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kensho-kfinance
-Version: 2.0.1
+Version: 2.2.2
 Summary: Python CLI for kFinance
 Author-email: Luke Brown <luke.brown@kensho.com>, Michelle Keoy <michelle.keoy@kensho.com>, Keith Page <keith.page@kensho.com>, Matthew Rosen <matthew.rosen@kensho.com>, Nick Roshdieh <nick.roshdieh@kensho.com>
 Project-URL: source, https://github.com/kensho-technologies/kfinance
@@ -12,6 +12,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.md
+Requires-Dist: cachetools<6,>=5.5
 Requires-Dist: langchain-core>=0.3.15
 Requires-Dist: langchain-google-genai<3,>=2.1.0
 Requires-Dist: numpy>=1.22.4
@@ -27,12 +28,17 @@ Requires-Dist: requests<3,>=2.22.0
 Requires-Dist: urllib3>=1.21.1
 Provides-Extra: dev
 Requires-Dist: coverage<8,>=7.6.10; extra == "dev"
+Requires-Dist: ipykernel<7,>=6.29; extra == "dev"
 Requires-Dist: mypy<2,>=1.15.0; extra == "dev"
+Requires-Dist: nbconvert<8,>=7.16; extra == "dev"
+Requires-Dist: nbformat<6,>5.10; extra == "dev"
+Requires-Dist: nbqa<2,>1.9; extra == "dev"
 Requires-Dist: pytest<7,>=6.1.2; extra == "dev"
 Requires-Dist: pytest-cov<7,>=6.0.0; extra == "dev"
 Requires-Dist: requests_mock<2,>=1.12; extra == "dev"
 Requires-Dist: ruff<1,>=0.9.4; extra == "dev"
 Requires-Dist: time_machine<3,>=2.1; extra == "dev"
+Requires-Dist: types-cachetools<6,>=5.5; extra == "dev"
 Dynamic: license-file
 
 # kFinance
@@ -55,6 +61,8 @@ To receive access, please email [S&P Global Market Intelligence](market.intellig
 
 Once access is obtained, get started using the [Authentication Guide](https://docs.kensho.com/llmreadyapi/kf-authentication) and [Usage Guide](https://docs.kensho.com/llmreadyapi/usage).
 
+We also provide an [interactive notebook](usage_examples.ipynb) that demonstrates some usage examples.
+
 # Versioning
 The kFinance uses semantic versioning (major, minor, patch). 
 To bump the version, add a new entry in [CHANGELOG.md](kfinance%2FCHANGELOG.md). 

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/kensho_kfinance.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ README.md
 justfile
 pyproject.toml
 setup.py
+usage_examples.ipynb
 .github/workflows/ci-lint.yml
 .github/workflows/ci-test.yml
 .github/workflows/python-publish.yml
@@ -20,6 +21,7 @@ docs/requirements.txt
 docs/tool_calling.rst
 docs/templates/apidoc/package.rst_t
 docs/templates/apidoc/toc.rst_t
+images/colab_logo_32px.png
 kensho_kfinance.egg-info/PKG-INFO
 kensho_kfinance.egg-info/SOURCES.txt
 kensho_kfinance.egg-info/dependency_links.txt
@@ -37,15 +39,18 @@ kfinance/py.typed
 kfinance/server_thread.py
 kfinance/version.py
 kfinance/tests/__init__.py
+kfinance/tests/conftest.py
 kfinance/tests/test_batch_requests.py
+kfinance/tests/test_client.py
+kfinance/tests/test_example_notebook.py
 kfinance/tests/test_fetch.py
+kfinance/tests/test_group_objects.py
 kfinance/tests/test_objects.py
 kfinance/tests/test_tools.py
 kfinance/tool_calling/README.md
 kfinance/tool_calling/__init__.py
 kfinance/tool_calling/get_business_relationship_from_identifier.py
 kfinance/tool_calling/get_capitalization_from_identifier.py
-kfinance/tool_calling/get_company_id_from_identifier.py
 kfinance/tool_calling/get_cusip_from_ticker.py
 kfinance/tool_calling/get_earnings_call_datetimes_from_identifier.py
 kfinance/tool_calling/get_financial_line_item_from_identifier.py
@@ -56,8 +61,7 @@ kfinance/tool_calling/get_isin_from_ticker.py
 kfinance/tool_calling/get_latest.py
 kfinance/tool_calling/get_n_quarters_ago.py
 kfinance/tool_calling/get_prices_from_identifier.py
-kfinance/tool_calling/get_security_id_from_identifier.py
-kfinance/tool_calling/get_trading_item_id_from_identifier.py
+kfinance/tool_calling/resolve_identifier.py
 kfinance/tool_calling/shared_models.py
 scripts/copyright_line_check.sh
 scripts/lint.sh

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/kensho_kfinance.egg-info/requires.txt

@@ -1,3 +1,4 @@
+cachetools<6,>=5.5
 langchain-core>=0.3.15
 langchain-google-genai<3,>=2.1.0
 numpy>=1.22.4
@@ -14,9 +15,14 @@ urllib3>=1.21.1
 
 [dev]
 coverage<8,>=7.6.10
+ipykernel<7,>=6.29
 mypy<2,>=1.15.0
+nbconvert<8,>=7.16
+nbformat<6,>5.10
+nbqa<2,>1.9
 pytest<7,>=6.1.2
 pytest-cov<7,>=6.0.0
 requests_mock<2,>=1.12
 ruff<1,>=0.9.4
 time_machine<3,>=2.1
+types-cachetools<6,>=5.5

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/kfinance/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v2.2.2
+- Add segments
+
+## v2.2.1
+- Make number of employees optional to reflect backend changes
+
+## v2.2.0
+- Replace get company id, get security id, get trading item id tools with resolve identifier tool
+
+## v2.1.2
+- Allow batch executor to handle multiple requests
+
+## v2.1.1
+- Use cachetools cache
+
+## v2.1.0
+- Filter llm tools by user permissions
+
+## v2.0.2
+- Add Client.tickers() method for ticker industry filters for ISRCS and GICS
+
 ## v2.0.1
 - Fix readthedocs integration for llm tools.
 

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/kfinance/batch_request_handling.py

@@ -1,4 +1,4 @@
-from concurrent.futures import ThreadPoolExecutor
+from concurrent.futures import Future
 import functools
 from functools import cached_property
 import threading
@@ -55,36 +55,26 @@ def add_methods_of_singular_class_to_iterable_class(singular_cls: Type[T]) -> Ca
             instances of [singular_cls].
         """
 
-        def process_in_thread_pool(
-            executor: ThreadPoolExecutor, method: Callable, obj: T, *args: Any, **kwargs: Any
-        ) -> Any:
-            with throttle:
-                future = executor.submit(method, obj, *args, **kwargs)
-                try:
-                    return future.result()
-                except HTTPError as http_err:
-                    error_code = http_err.response.status_code
-                    if error_code == 404:
-                        return None
-                    else:
-                        raise http_err
-
         def process_in_batch(
             method: Callable, self: IterableKfinanceClass, *args: Any, **kwargs: Any
         ) -> dict:
-            results = {}
-            kfinance_api_client = self.kfinance_api_client
-            with kfinance_api_client.batch_request_header(batch_size=len(self)):
-                with kfinance_api_client.thread_pool as executor:
-                    results = dict(
-                        zip(
-                            self,
-                            [
-                                process_in_thread_pool(executor, method, obj, *args, **kwargs)
-                                for obj in self
-                            ],
-                        )
+            with self.kfinance_api_client.batch_request_header(batch_size=len(self)):
+                futures = []
+                for obj in self:
+                    # Acquire throttle before submitting the task
+                    throttle.acquire()
+                    future = self.kfinance_api_client.thread_pool.submit(
+                        method, obj, *args, **kwargs
                     )
+                    # On success or failure, release the throttle.
+                    # This releases the throttle before the
+                    # `resolve_future_with_error_handling` call.
+                    future.add_done_callback(lambda f: throttle.release())
+                    futures.append(future)
+
+                results = {}
+                for obj, future in zip(self, futures):
+                    results[obj] = resolve_future_with_error_handling(future)
 
             return results
 
@@ -135,3 +125,18 @@ def add_methods_of_singular_class_to_iterable_class(singular_cls: Type[T]) -> Ca
         return iterable_cls
 
     return decorator
+
+
+def resolve_future_with_error_handling(future: Future) -> Any:
+    """Return the result of a future with error handling for non-200 status codes.
+
+    If request returned a 404, return None. Otherwise, raise the error.
+    """
+    try:
+        return future.result()
+    except HTTPError as http_err:
+        error_code = http_err.response.status_code
+        if error_code == 404:
+            return None
+        else:
+            raise http_err

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/kfinance/constants.py

@@ -1,7 +1,6 @@
 from datetime import date
-from enum import Enum
 from itertools import chain
-from typing import TypedDict
+from typing import NamedTuple, TypedDict
 
 from strenum import StrEnum
 
@@ -21,13 +20,13 @@ class HistoryMetadata(TypedDict):
     first_trade_date: date
 
 
-class IdentificationTriple(TypedDict):
+class IdentificationTriple(NamedTuple):
     trading_item_id: int
     security_id: int
     company_id: int
 
 
-class Capitalization(Enum):
+class Capitalization(StrEnum):
     """The capitalization type"""
 
     market_cap = "market_cap"
@@ -35,7 +34,7 @@ class Capitalization(Enum):
     shares_outstanding = "shares_outstanding"
 
 
-class PeriodType(Enum):
+class PeriodType(StrEnum):
     """The period type"""
 
     annual = "annual"
@@ -44,7 +43,7 @@ class PeriodType(Enum):
     ytd = "ytd"
 
 
-class Periodicity(Enum):
+class Periodicity(StrEnum):
     """The frequency or interval at which the historical data points are sampled or aggregated. Periodicity is not the same as the date range. The date range specifies the time span over which the data is retrieved, while periodicity determines how the data within that date range is aggregated."""
 
     day = "day"
@@ -53,7 +52,7 @@ class Periodicity(Enum):
     year = "year"
 
 
-class StatementType(Enum):
+class StatementType(StrEnum):
     """The type of financial statement"""
 
     balance_sheet = "balance_sheet"
@@ -63,6 +62,13 @@ class StatementType(Enum):
     cf = "cashflow"
 
 
+class SegmentType(StrEnum):
+    """The type of segment"""
+
+    business = "business"
+    geographic = "geographic"
+
+
 class BusinessRelationshipType(StrEnum):
     """The type of business relationship"""
 
@@ -88,6 +94,16 @@ class BusinessRelationshipType(StrEnum):
     client_services = "client_services"
 
 
+class Permission(StrEnum):
+    EarningsPermission = "EarningsPermission"
+    GICSPermission = "GICSPermission"
+    IDPermission = "IDPermission"
+    ISCRSPermission = "ISCRSPermission"
+    PricingPermission = "PricingPermission"
+    RelationshipPermission = "RelationshipPermission"
+    StatementsPermission = "StatementsPermission"
+
+
 class YearAndQuarter(TypedDict):
     year: int
     quarter: int

{kensho_kfinance-2.0.1 → kensho_kfinance-2.2.2}/kfinance/fetch.py

@@ -1,5 +1,6 @@
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import contextmanager
+import logging
 from time import time
 from typing import Callable, Generator, Optional
 from uuid import uuid4
@@ -13,6 +14,8 @@ from .constants import (
     IndustryClassification,
     Periodicity,
     PeriodType,
+    Permission,
+    SegmentType,
 )
 
 
@@ -23,6 +26,8 @@ try:
 except ImportError:
     kfinance_version = "dev"
 
+logger = logging.getLogger(__name__)
+
 
 DEFAULT_API_HOST: str = "https://kfinance.kensho.com"
 DEFAULT_API_VERSION: int = 1
@@ -86,6 +91,7 @@ class KFinanceApiClient:
         self.user_agent_source = "object_oriented"
         self._batch_id: str | None = None
         self._batch_size: str | None = None
+        self._user_permissions: set[Permission] | None = None
 
     @contextmanager
     def batch_request_header(self, batch_size: int) -> Generator:
@@ -127,6 +133,9 @@ class KFinanceApiClient:
                 # nosemgrep:  python.jwt.security.unverified-jwt-decode.unverified-jwt-decode
                 options={"verify_signature": False},
             ).get("exp")
+            # When the access token gets refreshed, also refresh user permissions in case they
+            # have been updated.
+            self._refresh_user_permissions()
         return self._access_token
 
     def _get_access_token_via_refresh_token(self) -> str:
@@ -169,6 +178,33 @@ class KFinanceApiClient:
         response.raise_for_status()
         return response.json().get("access_token")
 
+    @property
+    def user_permissions(self) -> set[Permission]:
+        """Return the permissions that the current user holds."""
+
+        if self._user_permissions is None:
+            self._refresh_user_permissions()
+            # _refresh_user_permissions updates self._user_permissions in place
+            assert self._user_permissions is not None
+        return self._user_permissions
+
+    def _refresh_user_permissions(self) -> None:
+        """Fetches user permissions and stores them as KfinanceApiClient._user_permissions."""
+
+        user_permission_dict = self.fetch_permissions()
+        self._user_permissions = set()
+        for permission_str in user_permission_dict["permissions"]:
+            try:
+                self._user_permissions.add(Permission[permission_str])
+            except KeyError:
+                logger.warning(
+                    "Could not resolve %s to a member of the Permission enum. "
+                    "%s may be a new type of permission that still needs to be "
+                    "added to the enum.",
+                    permission_str,
+                    permission_str,
+                )
+
     def fetch(self, url: str) -> dict:
         """Does the request and auth"""
 
@@ -191,6 +227,11 @@ class KFinanceApiClient:
         response.raise_for_status()
         return response.json()
 
+    def fetch_permissions(self) -> dict[str, list[str]]:
+        """Return the permissions of the user."""
+        url = f"{self.url_base}users/permissions"
+        return self.fetch(url)
+
     def fetch_id_triple(self, identifier: str, exchange_code: Optional[str] = None) -> dict:
         """Get the ID triple from [identifier]."""
         url = f"{self.url_base}id/{identifier}"
@@ -241,7 +282,7 @@ class KFinanceApiClient:
             f"{self.url_base}pricing/{trading_item_id}/"
             f"{start_date if start_date is not None else 'none'}/"
             f"{end_date if end_date is not None else 'none'}/"
-            f"{periodicity.value if periodicity else 'none'}/"
+            f"{periodicity if periodicity else 'none'}/"
             f"{'adjusted' if is_adjusted else 'unadjusted'}"
         )
         return self.fetch(url)
@@ -265,6 +306,27 @@ class KFinanceApiClient:
         )
         return self.fetch(url)
 
+    def fetch_segments(
+        self,
+        company_id: int,
+        segment_type: SegmentType,
+        period_type: Optional[PeriodType] = None,
+        start_year: Optional[int] = None,
+        end_year: Optional[int] = None,
+        start_quarter: Optional[int] = None,
+        end_quarter: Optional[int] = None,
+    ) -> dict:
+        """Get a specified segment type for a specified duration."""
+        url = (
+            f"{self.url_base}segments/{company_id}/{segment_type}/"
+            f"{period_type if period_type else 'none'}/"
+            f"{start_year if start_year is not None else 'none'}/"
+            f"{end_year if end_year is not None else 'none'}/"
+            f"{start_quarter if start_quarter is not None else 'none'}/"
+            f"{end_quarter if end_quarter is not None else 'none'}"
+        )
+        return self.fetch(url)
+
     def fetch_price_chart(
         self,
         trading_item_id: int,
@@ -278,7 +340,7 @@ class KFinanceApiClient:
             f"{self.url_base}price_chart/{trading_item_id}/"
             f"{start_date if start_date is not None else 'none'}/"
             f"{end_date if end_date is not None else 'none'}/"
-            f"{periodicity.value if periodicity else 'none'}/"
+            f"{periodicity if periodicity else 'none'}/"
             f"{'adjusted' if is_adjusted else 'unadjusted'}"
         )
 
@@ -306,7 +368,7 @@ class KFinanceApiClient:
         """Get a specified financial statement for a specified duration."""
         url = (
             f"{self.url_base}statements/{company_id}/{statement_type}/"
-            f"{period_type.value if period_type else 'none'}/"
+            f"{period_type if period_type else 'none'}/"
             f"{start_year if start_year is not None else 'none'}/"
             f"{end_year if end_year is not None else 'none'}/"
             f"{start_quarter if start_quarter is not None else 'none'}/"
@@ -327,7 +389,7 @@ class KFinanceApiClient:
         """Get a specified financial line item for a specified duration."""
         url = (
             f"{self.url_base}line_item/{company_id}/{line_item}/"
-            f"{period_type.value if period_type else 'none'}/"
+            f"{period_type if period_type else 'none'}/"
             f"{start_year if start_year is not None else 'none'}/"
             f"{end_year if end_year is not None else 'none'}/"
             f"{start_quarter if start_quarter is not None else 'none'}/"
@@ -358,10 +420,12 @@ class KFinanceApiClient:
         self,
         country_iso_code: str,
         state_iso_code: Optional[str] = None,
-    ) -> dict[str, list[IdentificationTriple]]:
+    ) -> list[IdentificationTriple]:
         """Fetch ticker geography groups"""
-        return self.fetch_geography_groups(
-            country_iso_code=country_iso_code, state_iso_code=state_iso_code, fetch_ticker=True
+        return self._tickers_response_to_id_triple(
+            self.fetch_geography_groups(
+                country_iso_code=country_iso_code, state_iso_code=state_iso_code, fetch_ticker=True
+            )
         )
 
     def fetch_company_geography_groups(
@@ -381,13 +445,13 @@ class KFinanceApiClient:
         url = f"{self.url_base}{'ticker_groups' if fetch_ticker else 'trading_item_groups'}/exchange/{exchange_code}"
         return self.fetch(url)
 
-    def fetch_ticker_exchange_groups(
-        self, exchange_code: str
-    ) -> dict[str, list[IdentificationTriple]]:
+    def fetch_ticker_exchange_groups(self, exchange_code: str) -> list[IdentificationTriple]:
         """Fetch ticker exchange groups"""
-        return self.fetch_exchange_groups(
-            exchange_code=exchange_code,
-            fetch_ticker=True,
+        return self._tickers_response_to_id_triple(
+            self.fetch_exchange_groups(
+                exchange_code=exchange_code,
+                fetch_ticker=True,
+            )
         )
 
     def fetch_trading_item_exchange_groups(self, exchange_code: str) -> dict[str, list[int]]:
@@ -397,13 +461,32 @@ class KFinanceApiClient:
             fetch_ticker=False,
         )
 
+    @staticmethod
+    def _tickers_response_to_id_triple(
+        tickers_response: dict[str, list[dict]],
+    ) -> list[IdentificationTriple]:
+        """For fetch ticker cases with a dict[str, list[dict]] response, return a list[IdentificationTriple].
+
+        For example, with a given fetch tickers response:
+        {"tickers" : [{"trading_item_id": 1, "security_id": 1, "company_id": 1}, {"trading_item_id": 2,"security_id": 2,"company_id": 2}]},
+        return [[1, 1, 1], [2, 2, 2]].
+        """
+        return [
+            IdentificationTriple(
+                trading_item_id=ticker["trading_item_id"],
+                security_id=ticker["security_id"],
+                company_id=ticker["company_id"],
+            )
+            for ticker in tickers_response["tickers"]
+        ]
+
     def fetch_ticker_combined(
         self,
         country_iso_code: Optional[str] = None,
         state_iso_code: Optional[str] = None,
         simple_industry: Optional[str] = None,
         exchange_code: Optional[str] = None,
-    ) -> dict[str, list[IdentificationTriple]]:
+    ) -> list[IdentificationTriple]:
         """Fetch tickers using combined filters route"""
         if (
             country_iso_code is None
@@ -414,11 +497,11 @@ class KFinanceApiClient:
             raise RuntimeError("Invalid parameters: No parameters provided or all set to none")
         elif country_iso_code is None and state_iso_code is not None:
             raise RuntimeError(
-                "Invalid parameters: state_iso_code must be provided with a country_iso_code value"
+                "Invalid parameters: country_iso_code must be provided with a state_iso_code value"
             )
         else:
             url = f"{self.url_base}ticker_groups/filters/geo/{str(country_iso_code).lower()}/{str(state_iso_code).lower()}/simple/{str(simple_industry).lower()}/exchange/{str(exchange_code).lower()}"
-            return self.fetch(url)
+            return self._tickers_response_to_id_triple(self.fetch(url))
 
     def fetch_companies_from_business_relationship(
         self, company_id: int, relationship_type: BusinessRelationshipType
@@ -443,22 +526,11 @@ class KFinanceApiClient:
         url = f"{self.url_base}relationship/{company_id}/{relationship_type}"
         return self.fetch(url)
 
-    def fetch_from_industry_code(
-        self,
-        industry_code: str,
-        industry_classification: IndustryClassification,
-        fetch_ticker: bool = True,
-    ) -> dict[str, list]:
-        """Fetches a list of companies or identification triples that are classified in the given industry_code and industry_classification."""
-
-        url = f"{self.url_base}{'ticker_groups' if fetch_ticker else 'company_groups'}/industry/{industry_classification}/{industry_code}"
-        return self.fetch(url)
-
     def fetch_ticker_from_industry_code(
         self,
         industry_code: str,
         industry_classification: IndustryClassification,
-    ) -> dict[str, list[IdentificationTriple]]:
+    ) -> list[IdentificationTriple]:
         """Fetches a list of identification triples that are classified in the given industry_code and industry_classification.
 
         Returns a dictionary of shape {"tickers": List[{“company_id”: <company_id>, “security_id”: <security_id>, “trading_item_id”: <trading_item_id>}]}.
@@ -466,14 +538,11 @@ class KFinanceApiClient:
         :type industry_code: str
         :param industry_classification: The type of industry_classification to filter on.
         :type industry_classification: IndustryClassification
-        :return: A dictionary containing the list of identification triple [company_id, security_id, trading_item_id] that are classified in the given industry_code and industry_classification.
-        :rtype: dict[str, list[IdentificationTriple]]
+        :return: A list of identification triples [company_id, security_id, trading_item_id] that are classified in the given industry_code and industry_classification.
+        :rtype: list[IdentificationTriple]
         """
-        return self.fetch_from_industry_code(
-            industry_code=industry_code,
-            industry_classification=industry_classification,
-            fetch_ticker=True,
-        )
+        url = f"{self.url_base}ticker_groups/industry/{industry_classification}/{industry_code}"
+        return self._tickers_response_to_id_triple(self.fetch(url))
 
     def fetch_company_from_industry_code(
         self,
@@ -490,8 +559,5 @@ class KFinanceApiClient:
         :return: A dictionary containing the list of companies that are classified in the given industry_code and industry_classification.
         :rtype: dict[str, list[int]]
         """
-        return self.fetch_from_industry_code(
-            industry_code=industry_code,
-            industry_classification=industry_classification,
-            fetch_ticker=False,
-        )
+        url = f"{self.url_base}company_groups/industry/{industry_classification}/{industry_code}"
+        return self.fetch(url)