sovai 0.2.9__tar.gz → 0.2.12__tar.gz

{sovai-0.2.9 → sovai-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovai
-Version: 0.2.9
+Version: 0.2.12
 Summary: python for asset management
 License: Proprietary License
 Author: Derek Snow

{sovai-0.2.9 → sovai-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovai"
-version = "0.2.9"
+version = "0.2.12"
 description = "python for asset management"
 authors = ["Derek Snow <d.snow@outlook.com>"]
 license = "Proprietary License"

{sovai-0.2.9 → sovai-0.2.12}/sovai/utils/client_side.py

@@ -2,12 +2,20 @@ import pandas as pd
 from concurrent.futures import ThreadPoolExecutor
 from urllib.parse import quote
 import datetime
-from sovai.extensions.pandas_extensions import CustomDataFrame
 from sovai.errors.sovai_errors import InvalidCredentialsError
 
 import requests
 from sovai.api_config import ApiConfig
 
+# Try to import CustomDataFrame, use regular DataFrame if not available
+try:
+    from sovai.extensions.pandas_extensions import CustomDataFrame
+    HAS_CUSTOM_DATAFRAME = True
+except ImportError:
+    HAS_CUSTOM_DATAFRAME = False
+    CustomDataFrame = pd.DataFrame  # Fallback to regular DataFrame
+
+
 def verify_token(verbose=False):
     url = f"{ApiConfig.base_url}/verify/token/{ApiConfig.token}"  # Updated endpoint
     try:
@@ -122,12 +130,12 @@ def load_data_for_tickers(
     return combined_df.sort_index()
 
 
-def client_side_frame(endpoint, tickers, columns, start_date, end_date):
 
+
+def client_side_frame(endpoint, tickers, columns, start_date, end_date):
     is_valid, user_id = verify_token(verbose=False)
 
     if not is_valid:
-        # print('invalid')
         raise InvalidCredentialsError("Invalid or expired token. Please authenticate.")
 
     endpoint_config = {
@@ -180,4 +188,69 @@ def client_side_frame(endpoint, tickers, columns, start_date, end_date):
     df_percentiles = load_data_for_tickers(
         base_url, tickers, columns, start_date, end_date, name_file, partitioned
     )
-    return CustomDataFrame(df_percentiles)
+    
+    if HAS_CUSTOM_DATAFRAME:
+        return CustomDataFrame(df_percentiles)
+    else:
+        return df_percentiles  # Returns a regular pandas DataFrame if CustomDataFrame is not available
+    
+
+# def client_side_frame(endpoint, tickers, columns, start_date, end_date):
+
+#     is_valid, user_id = verify_token(verbose=False)
+
+#     if not is_valid:
+#         # print('invalid')
+#         raise InvalidCredentialsError("Invalid or expired token. Please authenticate.")
+
+#     endpoint_config = {
+#         "ratios/relative": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-accounting/processed/ratios_percentile_weekly.parq",
+#             "name": "ratios_percentile_weekly_0.parquet",
+#             "partitioned": False,
+#         },
+#         "market/prices": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-accounting/prices.parq",
+#             "name": "prices_0.parquet",
+#             "partitioned": False,
+#         },
+#         "market/closeadj": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-accounting/prices_closeadj.parq",
+#             "name": "prices_closeadj_0.parquet",
+#             "partitioned": False,
+#         },
+#         "complaints/public": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-complaints/processed/consumer_complaint_public.parq",
+#             "name": "consumer_complaint_0.parquet",
+#             "partitioned": False,
+#         },
+#         "complaints/private": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-complaints/processed/consumer_complaint_private.parq",
+#             "name": "consumer_complaint_0.parquet",
+#             "partitioned": False,
+#         },
+#         "lobbying/public": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-lobbying/processed/lobbying_public.parq",
+#             "name": "lobbying_public_0.parquet",
+#             "partitioned": True,
+#         },
+#         "short/volume": {
+#             "url": "https://storage.googleapis.com/sovai-partitioned/sovai-short/processed/short_volume_weekly.parq",
+#             "name": "short_volume_weekly_0.parquet",
+#             "partitioned": True,
+#         },
+#     }
+
+#     if endpoint not in endpoint_config:
+#         raise ValueError(f"Invalid endpoint: {endpoint}")
+
+#     config = endpoint_config[endpoint]
+#     base_url = config["url"]
+#     name_file = config["name"]
+#     partitioned = config["partitioned"]
+
+#     # Load data
+#     df_percentiles = load_data_for_tickers(
+#         base_url, tickers, columns, start_date, end_date, name_file, partitioned
+#     )
+#     return CustomDataFrame(df_percentiles)