diff --git a/kintree/database/inventree_api.py b/kintree/database/inventree_api.py index 3d7e364b..d48511c8 100644 --- a/kintree/database/inventree_api.py +++ b/kintree/database/inventree_api.py @@ -17,10 +17,11 @@ # InvenTree from inventree.api import InvenTreeAPI from inventree.company import Company, ManufacturerPart, SupplierPart, SupplierPriceBreak -from inventree.part import Part, PartCategory, Parameter, ParameterTemplate +from inventree.part import Part, PartCategory from inventree.currency import CurrencyManager from inventree.stock import StockLocation from inventree.stock import StockItem +from inventree.base import ParameterTemplate, Parameter def connect(server: str, @@ -56,8 +57,7 @@ def set_inventree_db_test_mode(): ''' InvenTree test database setup ''' global inventree_api - inventree_api.patch('settings/global/PART_PARAMETER_ENFORCE_UNITS', {'value': False}) - + inventree_api.patch('settings/global/PARAMETER_ENFORCE_UNITS/', {'value': False}) def get_inventree_category_id(category_tree: list) -> int: ''' Get InvenTree category ID from name, specificy parent if subcategory ''' diff --git a/kintree/database/inventree_interface.py b/kintree/database/inventree_interface.py index bb992f42..97b10d50 100644 --- a/kintree/database/inventree_interface.py +++ b/kintree/database/inventree_interface.py @@ -593,7 +593,7 @@ def inventree_create(part_info: dict, stock=None, kicad=False, symbol=None, foot # Update InvenTree part number inventree_part = {**inventree_part, **info} # Update InvenTree URL - inventree_part['inventree_url'] = f'{settings.PART_URL_ROOT}{inventree_part["IPN"]}/' + inventree_part['inventree_url'] = f'{settings.PART_URL_ROOT}{part_pk}/' else: inventree_part['inventree_url'] = f'{settings.PART_URL_ROOT}{part_pk}/' # Part is new @@ -643,7 +643,7 @@ def inventree_create(part_info: dict, stock=None, kicad=False, symbol=None, foot cprint('\n[INFO]\tError updating IPN', silent=settings.SILENT) inventree_part['IPN'] = ipn # Update InvenTree URL - inventree_part['inventree_url'] = f'{settings.PART_URL_ROOT}{inventree_part["IPN"]}/' + inventree_part['inventree_url'] = f'{settings.PART_URL_ROOT}{part_pk}/' else: inventree_part['inventree_url'] = f'{settings.PART_URL_ROOT}{part_pk}/' diff --git a/kintree/kicad/kicad_symbol.py b/kintree/kicad/kicad_symbol.py index f2700389..e5b477e6 100644 --- a/kintree/kicad/kicad_symbol.py +++ b/kintree/kicad/kicad_symbol.py @@ -104,7 +104,7 @@ def replace_wildcards(field): # Add symbol to library self.kicad_lib.symbols.append(new_symbol) # Write library - self.kicad_lib.to_file() + self.kicad_lib.to_file(encoding="utf-8") cprint(f'[KCAD]\tSuccess: Component added to library {self.library_name}', silent=settings.SILENT) part_in_lib = True diff --git a/requirements.txt b/requirements.txt index eda2c73d..8b74d280 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ cloudscraper==1.2.71 setuptools==75.2.0 https://github.com/hurricaneJoef/digikey-api/archive/refs/heads/master.zip -Flet>=0.24.1,<1.0 +Flet>=0.24.1,<=0.24.1 thefuzz>=0.19.0,<1.0 -inventree>=0.17.1,<1.0 +inventree>=0.23.1,<1.0 kiutils>=1.4.8,<2.0 mouser>=0.1.6,<1.0 multiprocess>=0.70.16,<0.71