wbportfolio 1.55.9__tar.gz → 1.56.0__tar.gz

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.55.9
+Version: 1.56.0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/api_clients/ubs.py

@@ -62,21 +62,21 @@ class UBSNeoAPIClient:
     def _raise_for_status(self, response):
         try:
             response.raise_for_status()
-        except HTTPError:
+        except HTTPError as e:
             json_response = response.json()
-            raise HTTPError(json_response.get("errors", json_response.get("message")))
+            raise HTTPError(json_response.get("errors", json_response.get("message"))) from e
 
     def get_rebalance_service_status(self) -> dict:
         """Check API connection status."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/status"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_rebalance_status_for_isin(self, isin: str) -> dict:
         """Check certificate accessibility and workflow status for given ISIN."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/status/{isin}"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -90,7 +90,7 @@ class UBSNeoAPIClient:
         isin = self._validate_isin(isin, test=test)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/submit/{isin}"
         payload = {"items": items}
-        response = requests.post(url, json=payload, headers=self._get_headers())
+        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -99,7 +99,7 @@ class UBSNeoAPIClient:
         isin = self._validate_isin(isin)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/savedraft/{isin}"
         payload = {"items": items}
-        response = requests.post(url, json=payload, headers=self._get_headers())
+        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -107,20 +107,20 @@ class UBSNeoAPIClient:
         """Cancel a rebalance request."""
         isin = self._validate_isin(isin)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/cancel/{isin}"
-        response = requests.delete(url, headers=self._get_headers())
+        response = requests.delete(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_current_rebalance_request(self, isin: str) -> dict:
         """Fetch the current rebalance request for a certificate."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/currentRebalanceRequest/{isin}"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_portfolio_at_date(self, isin: str, val_date: date) -> dict:
         url = f"https://neo.ubs.com/api/ged-amc/external/report/v1/valuation/{isin}/{val_date:%Y-%m-%d}"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -130,6 +130,7 @@ class UBSNeoAPIClient:
             url,
             headers=self._get_headers(),
             params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
+            timeout=10,
         )
         self._raise_for_status(response)
         return self._get_json(response)
@@ -140,6 +141,7 @@ class UBSNeoAPIClient:
             url,
             headers=self._get_headers(),
             params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
+            timeout=10,
         )
         self._raise_for_status(response)
         return self._get_json(response)

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/contrib/company_portfolio/configs/display.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
 from django.utils.translation import gettext as _
-from wbcore.contrib.directory.viewsets.display.entries import CompanyModelDisplay as CMD
-from wbcore.contrib.directory.viewsets.display.entries import PersonModelDisplay as PMD
+from wbcore.contrib.directory.viewsets.display.entries import CompanyModelDisplay as BaseCompanyModelDisplay
+from wbcore.contrib.directory.viewsets.display.entries import PersonModelDisplay as BasePersonModelDisplay
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display import (
     Inline,
@@ -62,7 +62,7 @@ AUM_FIELDS = Section(
 )
 
 
-class CompanyModelDisplay(CMD):
+class CompanyModelDisplay(BaseCompanyModelDisplay):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         list_display = super().get_list_display()
         list_display.fields = (
@@ -134,7 +134,7 @@ class CompanyModelDisplay(CMD):
         return instance_display
 
 
-class PersonModelDisplay(PMD):
+class PersonModelDisplay(BasePersonModelDisplay):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         list_display = super().get_list_display()
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/contrib/company_portfolio/configs/previews.py

@@ -1,3 +1,5 @@
+from contextlib import suppress
+
 from wbcore.contrib.directory.viewsets.previews import EntryPreviewConfig
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import buttons as bt
@@ -17,12 +19,10 @@ class CompanyPreviewConfig(EntryPreviewConfig):
             ["asset_under_management", "invested_assets_under_management_usd"],
             [repeat_field(2, "potential")],
         ]
-        try:
+        with suppress(Exception):
             entry = self.view.get_object()
             if entry.profile_image:
                 fields.insert(0, [repeat_field(2, "profile_image")])
-        except Exception:
-            pass
 
         return create_simple_display(fields)
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/contrib/company_portfolio/filters.py

@@ -1,6 +1,6 @@
 from wbcore import filters
-from wbcore.contrib.directory.filters import CompanyFilter as CF
-from wbcore.contrib.directory.filters import PersonFilter as PF
+from wbcore.contrib.directory.filters import CompanyFilter as BaseCompanyFilter
+from wbcore.contrib.directory.filters import PersonFilter as BasePersonFilter
 from wbcore.contrib.directory.models import Company, Person
 
 
@@ -99,29 +99,29 @@ class EntryPortfolioFilter(filters.FilterSet):
         return queryset
 
 
-class CompanyFilter(CF, EntryPortfolioFilter):
+class CompanyFilter(BaseCompanyFilter, EntryPortfolioFilter):
     @classmethod
     def get_filter_class_for_remote_filter(cls):
         """
         Define which filterset class sender to user for remote filter registration
         """
-        return CF
+        return BaseCompanyFilter
 
-    class Meta(CF.Meta):
+    class Meta(BaseCompanyFilter.Meta):
         fields = {
-            **CF.Meta.fields,
+            **BaseCompanyFilter.Meta.fields,
         }
 
 
-class PersonFilter(PF, EntryPortfolioFilter):
+class PersonFilter(BasePersonFilter, EntryPortfolioFilter):
     @classmethod
     def get_filter_class_for_remote_filter(cls):
         """
         Define which filterset class sender to user for remote filter registration
         """
-        return PF
+        return BasePersonFilter
 
-    class Meta(PF.Meta):
+    class Meta(BasePersonFilter.Meta):
         fields = {
-            **PF.Meta.fields,
+            **BasePersonFilter.Meta.fields,
         }

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/contrib/company_portfolio/scripts.py

@@ -1,8 +1,11 @@
+import logging
 import re
 
 from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.directory.models import Company
 
+logger = logging.getLogger("pms")
+
 
 def get_currency_and_assets_under_management(
     aum_string, currency_mapping, default_currency, multiplier_mapping, default_multiplier
@@ -72,5 +75,7 @@ def assign_aum():
         portfolio_data.assets_under_management_currency = currency
         try:
             portfolio_data.save()
-        except Exception:
-            pass
+        except Exception as e:
+            logger.error(
+                f"while we try to save the customer portfolio aum data for {company}, we encounter the error: {e}"
+            )

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/factories/product_groups.py

@@ -21,10 +21,10 @@ class ProductGroupFactory(InstrumentFactory):
     paying_agent = factory.SubFactory("wbcore.contrib.directory.factories.entries.CompanyFactory")
 
     @factory.post_generation
-    def create_initial_portfolio(product_group, *args, **kwargs):
-        if product_group.id and not product_group.portfolios.exists():
+    def create_initial_portfolio(self, *args, **kwargs):
+        if self.id and not self.portfolios.exists():
             portfolio = PortfolioFactory.create()
-            InstrumentPortfolioThroughModel.objects.create(instrument=product_group, portfolio=portfolio)
+            InstrumentPortfolioThroughModel.objects.create(instrument=self, portfolio=portfolio)
 
 
 class ProductGroupRepresentantFactory(factory.django.DjangoModelFactory):

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/factories/products.py

@@ -40,10 +40,10 @@ class ProductFactory(InstrumentFactory):
     instrument_type = factory.LazyAttribute(lambda o: InstrumentTypeFactory.create(name="Product", key="product"))
 
     @factory.post_generation
-    def create_initial_portfolio(product, *args, **kwargs):
-        if product.id and not product.portfolios.exists():
+    def create_initial_portfolio(self, *args, **kwargs):
+        if self.id and not self.portfolios.exists():
             portfolio = PortfolioFactory.create()
-            InstrumentPortfolioThroughModel.objects.create(instrument=product, portfolio=portfolio)
+            InstrumentPortfolioThroughModel.objects.create(instrument=self, portfolio=portfolio)
 
     # wbportfolio = factory.SubFactory(PortfolioFactory)
     # portfolio_computed = factory.SubFactory(PortfolioFactory)

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/filters/assets.py

@@ -456,7 +456,6 @@ def get_default_hedged_currency(field, request, view):
 
 class ContributionChartFilter(wb_filters.FilterSet):
     date = wb_filters.FinancialPerformanceDateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/filters/positions.py

@@ -76,7 +76,6 @@ class AssetPositionPandasFilter(DateFilterMixin, PandasFilterSetMixin, wb_filter
     date = total_value_fx_usd = total_value_fx_usd__gte = total_value_fx_usd__lte = None
 
     date = wb_filters.FinancialPerformanceDateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/filters/transactions/fees.py

@@ -16,7 +16,6 @@ class FeesFilter(wb_filters.FilterSet):
     """
 
     fee_date = wb_filters.DateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         initial=get_transaction_default_date_range,
         required=True,
@@ -52,7 +51,6 @@ class FeesProductFilterSet(FeesFilter):
 class FeesAggregatedFilter(PandasFilterSetMixin, wb_filters.FilterSet):
     fee_date = wb_filters.DateRangeFilter(
         label="Date Range",
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         required=True,
         clearable=False,
         initial=current_quarter_date_range,

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/filters/transactions/trades.py

@@ -14,7 +14,6 @@ from .utils import get_transaction_default_date_range
 
 class TradeFilter(OppositeSharesFieldMethodMixin, wb_filters.FilterSet):
     transaction_date = wb_filters.DateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         initial=get_transaction_default_date_range,
     )

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/handlers/asset_position.py

@@ -78,14 +78,14 @@ class AssetPositionImportHandler(ImportExportHandler):
                     data["initial_price"] = data["underlying_quote"].get_price(
                         data["date"], price_date_timedelta=self.MAX_PRICE_DATE_TIMEDELTA
                     )
-                except ValueError:
-                    raise DeserializationError("Price not provided but can not be found automatically")
+                except ValueError as e:
+                    raise DeserializationError("Price not provided but can not be found automatically") from e
 
         # number type deserialization and sanitization
         # ensure the provided Decimal field are of type Decimal
         decimal_fields = ["initial_currency_fx_rate", "initial_price", "initial_shares", "weighting"]
         for field in decimal_fields:
-            if not (value := data.get(field, None)) is None:
+            if (value := data.get(field, None)) is not None:
                 data[field] = Decimal(value)
 
         if data["weighting"] == 0:

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/handlers/dividend.py

@@ -36,7 +36,7 @@ class DividendImportHandler(ImportExportHandler):
             data["currency"] = self.currency_handler.process_object(data["currency"], read_only=True)[0]
 
         for field in self.model._meta.get_fields():
-            if not (value := data.get(field.name, None)) is None and isinstance(field, models.DecimalField):
+            if (value := data.get(field.name, None)) is not None and isinstance(field, models.DecimalField):
                 q = 1 / (math.pow(10, 4))
                 data[field.name] = Decimal(value).quantize(Decimal(str(q)))
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/handlers/fees.py

@@ -24,8 +24,8 @@ class FeesImportHandler(ImportExportHandler):
                 data["product"] = Product.objects.get(**product_data)
             else:
                 data["product"] = Product.objects.get(id=product_data)
-        except Product.DoesNotExist:
-            raise DeserializationError("There is no valid linked product for in this row.")
+        except Product.DoesNotExist as e:
+            raise DeserializationError("There is no valid linked product for in this row.") from e
 
         if "currency" not in data:
             data["currency"] = data["product"].currency

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/handlers/trade.py

@@ -65,15 +65,15 @@ class TradeImportHandler(ImportExportHandler):
                 try:
                     product = Product.objects.get(id=underlying_instrument.id)
                     data["shares"] = nominal / product.share_price
-                except Product.DoesNotExist:
+                except Product.DoesNotExist as e:
                     raise DeserializationError(
                         "We cannot compute the number of shares from the nominal value as we cannot find the product share price."
-                    )
+                    ) from e
         else:
             raise DeserializationError("We couldn't find a valid underlying instrument this row.")
 
         for field in self.model._meta.get_fields():
-            if not (value := data.get(field.name, None)) is None and isinstance(field, models.DecimalField):
+            if (value := data.get(field.name, None)) is not None and isinstance(field, models.DecimalField):
                 q = (
                     1 / (math.pow(10, 4))
                 )  # we need that convertion mechanism otherwise there is floating point approximation error while casting to decimal and get_instance does not work as expected
@@ -86,7 +86,7 @@ class TradeImportHandler(ImportExportHandler):
             data["transaction_date"] = data["book_date"]
         return self.model.objects.create(**data, import_source=self.import_source)
 
-    def _get_instance(self, data: Dict[str, Any], history: Optional[models.QuerySet] = None, **kwargs) -> models.Model:
+    def _get_instance(self, data: Dict[str, Any], history: Optional[models.QuerySet] = None, **kwargs) -> models.Model:  # noqa: C901
         self.import_source.log += "\nGet Trade Instance."
         if transaction_date := data.get("transaction_date"):
             dates_lookup = {"transaction_date": transaction_date}

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/default_mapping.py

@@ -7,7 +7,7 @@ def parse(import_source):
     if (
         (data_backend := import_source.source.data_backend)
         and (backend_class := data_backend.backend_class)
-        and (default_mapping := getattr(backend_class, "DEFAULT_MAPPING"))
+        and (default_mapping := backend_class.DEFAULT_MAPPING)
     ):
         df = pd.read_json(import_source.file, orient="records")
         if not df.empty:

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/jpmorgan/customer_trade.py

@@ -11,8 +11,8 @@ from wbportfolio.models import Product, Trade
 def file_name_parse(file_name):
     dates = re.findall("([0-9]{8})", file_name)
 
-    assert len(dates) > 0
-
+    if len(dates) <= 0:
+        raise ValueError("No dates found in the filename")
     parts_dict = {"valuation_date": datetime.datetime.strptime(dates[0], "%Y%m%d").date()}
 
     isin = re.findall("([A-Z]{2}[A-Z0-9]{9}[0-9]{1})", file_name)

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/jpmorgan/fees.py

@@ -14,8 +14,8 @@ logger = logging.getLogger("importers.parsers.jpmorgan.fee")
 def file_name_parse(file_name):
     dates = re.findall("([0-9]{8})", file_name)
 
-    assert len(dates) == 1, "Not exactly 1 date found in the filename"
-
+    if len(dates) != 1:
+        raise ValueError("Not exactly 1 date found in the filename")
     return {"valuation_date": datetime.datetime.strptime(dates[0], "%Y%m%d").date()}
 
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/jpmorgan/strategy.py

@@ -13,8 +13,8 @@ logger = logging.getLogger("importers.parsers.jp_morgan.strategy")
 def file_name_parse(file_name):
     dates = re.findall("([0-9]{8})", file_name)
 
-    assert len(dates) == 1, "Not exactly 1 date found in the filename"
-
+    if len(dates) != 1:
+        raise ValueError("Not exactly 1 date found in the filename")
     return {"valuation_date": datetime.datetime.strptime(dates[0], "%Y%m%d").date()}
 
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/jpmorgan/valuation.py

@@ -13,8 +13,8 @@ logger = logging.getLogger("importers.parsers.jpmorgan.index")
 def file_name_parse(file_name):
     dates = re.findall("([0-9]{8})", file_name)
 
-    assert len(dates) == 1, "Not exactly 1 date found in the filename"
-
+    if len(dates) != 1:
+        raise ValueError("Not exactly 1 date found in the filename")
     return {"valuation_date": datetime.datetime.strptime(dates[0], "%Y%m%d").date()}
 
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/leonteq/trade.py

@@ -10,7 +10,8 @@ from wbportfolio.models import Product
 def file_name_parse(file_name):
     isin = re.findall("([A-Z]{2}[A-Z0-9]{9}[0-9]{1})", file_name)
 
-    assert len(isin) == 1, "Not exactly 1 isin found in the filename"
+    if len(isin) != 1:
+        raise ValueError("Not exactly 1 isin found in the filename")
 
     return {"isin": isin[0]}
 

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/natixis/equity.py

@@ -1,3 +1,5 @@
+from zipfile import BadZipFile
+
 import numpy as np
 import pandas as pd
 
@@ -29,13 +31,26 @@ def _apply_adjusting_factor(row):
 def parse(import_source):
     # Parse the Parts of the filename into the different parts
     parts = file_name_parse_isin(import_source.file.name)
-
     # Get the valuation date and investment from the parts list
     valuation_date = parts["valuation_date"]
     product_data = parts["product"]
 
     # Load file into a CSV DictReader
-    df = pd.read_csv(import_source.file, encoding="utf-16", delimiter=";")
+    if import_source.file.name.lower().endswith(".csv"):
+        df = pd.read_csv(import_source.file, encoding="utf-16", delimiter=";")
+    else:
+        try:
+            df = pd.read_excel(import_source.file, engine="openpyxl", sheet_name="Basket Valuation")
+        except BadZipFile:
+            df = pd.read_excel(import_source.file, engine="xlrd", sheet_name="Basket Valuation")
+        xx, yy = np.where(df == "Ticker")
+        if not xx and not yy:
+            xx, yy = np.where(df == "Code")
+        df = df.iloc[xx[0] :, yy[0] :]
+        df = df.rename(columns=df.iloc[0]).drop(df.index[0]).dropna(how="all")
+        df["Quotity/Adj. factor"] = 1.0
+        df = df.rename(columns={"Code": "Ticker"})
+
     df = df.rename(columns=FIELD_MAP)
     df = df.dropna(subset=["initial_price"])
     df["initial_price"] = df["initial_price"].astype("str").str.replace(" ", "").astype("float")
@@ -50,7 +65,10 @@ def parse(import_source):
     df = df.drop(columns=df.columns.difference(FIELD_MAP.values()))
 
     df["portfolio__instrument_type"] = "product"
-    df["portfolio__isin"] = product_data["isin"]
+    if "isin" in product_data:
+        df["portfolio__isin"] = product_data["isin"]
+    if "ticker" in product_data:
+        df["portfolio__ticker"] = product_data["ticker"]
     df["is_estimated"] = False
     df["date"] = valuation_date.strftime("%Y-%m-%d")
     df["asset_valuation_date"] = pd.to_datetime(df["asset_valuation_date"], dayfirst=True).dt.strftime("%Y-%m-%d")

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/natixis/utils.py

@@ -1,6 +1,7 @@
-import datetime
 import re
 
+from django.utils.dateparse import parse_date
+
 from wbportfolio.models import Product
 
 INSTRUMENT_MAP_NAME = {"EDA23_AtonRa Z class": "LU2170995018"}
@@ -53,21 +54,14 @@ def _get_underlying_instrument(bbg_code, name, currency, instrument_type="equity
 
 
 def file_name_parse_isin(file_name):
-    dates = re.findall(r"_([0-9]{4}-?[0-9]{2}-?[0-9]{2})", file_name)
-    identifier = re.findall(r"([A-Z]{2}(?![A-Z]{10}\b)[A-Z0-9]{10})_", file_name)
-    assert len(dates) == 2, "Not 2 dates found in the filename"
-    assert len(identifier) == 1, "Not exactly 1 identifier found in the filename"
-    try:
-        valuation_date = datetime.datetime.strptime(dates[0], "%Y-%m-%d").date()
-    except ValueError:
-        valuation_date = datetime.datetime.strptime(dates[0], "%Y%m%d").date()
-    try:
-        generation_date = datetime.datetime.strptime(dates[1], "%Y-%m-%d").date()
-    except ValueError:
-        generation_date = datetime.datetime.strptime(dates[1], "%Y%m%d").date()
-
-    return {
-        "product": {"isin": identifier[0]},
-        "valuation_date": valuation_date,
-        "generation_date": generation_date,
-    }
+    dates = re.findall(r"_([0-9]{4}[-_]?[0-9]{2}[-_]?[0-9]{2})", file_name)
+    isin = re.findall(r"([A-Z]{2}(?![A-Z]{10}\b)[A-Z0-9]{10})_", file_name)
+    ticker = re.findall(r"(NX[A-Z]*)_", file_name)
+    if len(dates) == 0:
+        raise ValueError("Not dates found in the filename")
+    res = {"valuation_date": parse_date(dates[0].replace("_", "-"))}
+    if len(isin) >= 1:
+        res["product"] = {"isin": isin[0]}
+    elif len(ticker) == 1:
+        res["product"] = {"ticker": ticker[0]}
+    return res

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/sg_lux/equity.py

@@ -11,9 +11,10 @@ from wbportfolio.models import ProductGroup
 def file_name_parse(file_name):
     dates = re.findall(r"([0-9]{4}-[0-9]{2}-[0-9]{2})", file_name)
     isin = re.findall(r"\.([a-zA-Z0-9]*)_", file_name)
-
-    assert len(dates) == 2, "Not 2 dates found in the filename"
-    assert len(isin) == 1, "Not exactly 1 isin found in the filename"
+    if len(dates) != 2:
+        raise ValueError("Not 2 dates found in the filename")
+    if len(isin) != 1:
+        raise ValueError("Not exactly 1 isin found in the filename")
 
     return {
         "isin": isin[0],

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/sg_lux/sylk.py

@@ -10,6 +10,7 @@ files generated by other spreadsheets.
 """
 
 import re
+from ast import literal_eval
 
 
 class Table:
@@ -185,7 +186,7 @@ class SYLK:
                 self.cury = int(val)
 
             elif ftd == "K":
-                val = eval(self.escape(val))
+                val = literal_eval(self.escape(val))
                 # if type(val) == int:
                 #     if self.currenttype == "date":
                 #         # value is offset in days from datebase
@@ -208,20 +209,20 @@ class SYLK:
                 self.printformats.append((format, self.knownformats[format]))
             else:
                 # hack to guess type...
-                hasY = "y" in format
-                hasD = "d" in format
-                hasH = "h" in format
-                hasZ = "0" in format
-                hasP = "." in format
-                if (hasD or hasY) and hasH:
+                has_y = "y" in format
+                has_d = "d" in format
+                has_h = "h" in format
+                has_z = "0" in format
+                has_p = "." in format
+                if (has_d or has_y) and has_h:
                     dtype = "datetime"
-                elif hasD or hasY:
+                elif has_d or has_y:
                     dtype = "date"
-                elif hasH:
+                elif has_h:
                     dtype = "time"
-                elif hasP and hasZ:
+                elif has_p and has_z:
                     dtype = "float"
-                elif hasZ:
+                elif has_z:
                     dtype = "int"
                 else:
                     dtype = "string"

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/sg_lux/valuation.py

@@ -10,8 +10,10 @@ def file_name_parse(file_name):
     dates = re.findall(r"([0-9]{4}-[0-9]{2}-[0-9]{2})", file_name)
     isin = re.findall(r"\.([a-zA-Z0-9]*)_", file_name)
 
-    assert len(dates) == 2, "Not 2 dates found in the filename"
-    assert len(isin) == 1, "Not exactly 1 isin found in the filename"
+    if len(dates) != 2:
+        raise ValueError("Not 2 dates found in the filename")
+    if len(isin) != 1:
+        raise ValueError("Not exactly 1 isin found in the filename")
 
     return {
         "isin": isin[0],

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/societe_generale/strategy.py

@@ -14,8 +14,8 @@ logger = logging.getLogger("importers.parsers.jp_morgan.strategy")
 def file_name_parse(file_name):
     dates = re.findall("([0-9]{8})", file_name)
 
-    assert len(dates) == 1, "Not exactly 1 date found in the filename"
-
+    if len(dates) != 1:
+        raise ValueError("Not exactly 1 date found in the filename")
     return {"valuation_date": datetime.datetime.strptime(dates[0], "%Y%m%d").date()}
 
 
@@ -23,7 +23,7 @@ def parse(import_source):
     data = list()
     prices = list()
     df_dict = pd.read_excel(BytesIO(import_source.file.read()), engine="openpyxl", sheet_name=None)
-    for sheet_name, df in df_dict.items():
+    for df in df_dict.values():
         xx, yy = np.where(df == "Ticker")
         if len(xx) == 1 and len(yy) == 1:
             df_info = df.iloc[: xx[0] - 1, :].transpose()

{wbportfolio-1.55.9 → wbportfolio-1.56.0}/wbportfolio/import_export/parsers/tellco/customer_trade.py

@@ -20,7 +20,8 @@ product_mapping = {
 
 def file_name_parse(file_name):
     identifier = re.findall("([0-9]{4}).*", file_name)
-    assert len(identifier) == 1, "Not exactly one identifier was found."
+    if len(identifier) != 1:
+        raise ValueError("Not exactly 1 identifier found in the filename")
     return identifier[0]