Merge 23eab93 into d1a59de

sparkmicro · Apr 2, 2024 · 17abfd4 · 17abfd4
2 parents d1a59de + 23eab93
commit 17abfd4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/test_deploy.yaml b/.github/workflows/test_deploy.yaml
@@ -93,7 +93,7 @@ jobs:
           export len_log=$(cat gui.log | wc -l)
           [[ ${len_log} -eq 0 ]] && true || false
       - name: Setup Digi-Key token
-        if: github.event.pull_request.head.repo.full_name == 'sparkmicro/Ki-nTree'
+        if: ${{ github.ref == 'refs/heads/main' || github.event.pull_request.head.repo.full_name == 'sparkmicro/Ki-nTree' }}
         run: |
           git clone https://$TOKEN_DIGIKEY@github.com/eeintech/digikey-token.git
           cd digikey-token/
@@ -108,7 +108,7 @@ jobs:
           echo -e "Digi-Key Token: $dk_token\n"
           cd ..
       - name: Run tests
-        if: github.event.pull_request.head.repo.full_name == 'sparkmicro/Ki-nTree'
+        if: ${{ github.ref == 'refs/heads/main' || github.event.pull_request.head.repo.full_name == 'sparkmicro/Ki-nTree' }}
         run: |
           invoke test -e 1
         env:
@@ -119,7 +119,7 @@ jobs:
         run: |
           invoke test -e 0
       - name: Coveralls
-        if: github.event.pull_request.head.repo.full_name == 'sparkmicro/Ki-nTree'
+        if: ${{ github.ref == 'refs/heads/main' || github.event.pull_request.head.repo.full_name == 'sparkmicro/Ki-nTree' }}
         run: |
           coveralls --version
           coveralls --service=github

diff --git a/kintree/database/inventree_interface.py b/kintree/database/inventree_interface.py
@@ -310,6 +310,8 @@ def translate_form_to_inventree(part_info: dict, category_tree: list, is_custom=
     inventree_part['pricing'] = part_info.get('pricing', {})
     inventree_part['currency'] = part_info.get('currency', 'USD')
 
+    parameters = part_info.get('parameters', {})
+
     # Load parameters map
     if category_tree:
         parameter_map = config_interface.load_category_parameters(
@@ -335,7 +337,7 @@ def translate_form_to_inventree(part_info: dict, category_tree: list, is_custom=
                             parameter_value = part_tools.clean_parameter_value(
                                 category=category_tree[0],
                                 name=supplier_param,
-                                value=part_info['parameters'][supplier_param],
+                                value=parameters[supplier_param],
                             )
                             inventree_part['parameters'][inventree_param] = parameter_value
                         except KeyError:
@@ -354,7 +356,7 @@ def translate_form_to_inventree(part_info: dict, category_tree: list, is_custom=
 
             # Check for extra parameters which weren't mapped
             parameters_unmapped = []
-            for search_param in part_info['parameters'].keys():
+            for search_param in parameters.keys():
                 if search_param not in parameter_map.keys():
                     parameters_unmapped.append(search_param)
 

diff --git a/kintree/gui/views/main.py b/kintree/gui/views/main.py
@@ -306,6 +306,7 @@ def run_search(self, e):
                 message=error_msg,
             )
         else:
+            self.fields['part_number'].value = self.fields['part_number'].value.strip()
             self.page.splash.visible = True
             self.page.update()
 

diff --git a/kintree/search/snapeda_api.py b/kintree/search/snapeda_api.py
@@ -111,7 +111,7 @@ def test_snapeda_api() -> bool:
     result = False
 
     # Test single result
-    response = fetch_snapeda_part_info('SN74LV4T125PWR')
+    response = fetch_snapeda_part_info('NTR06B2001CTRF')
     data = parse_snapeda_response(response)
     images = download_snapeda_images(data)