django-bom 1.228__tar.gz → 1.261__tar.gz

{django-bom-1.228/django_bom.egg-info → django_bom-1.261}/PKG-INFO

@@ -1,24 +1,34 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-bom
-Version: 1.228
+Version: 1.261
 Summary: A simple Django app to manage a bill of materials.
-Home-page: https://www.indabom.com/
-Author: Mike Kasparian
-Author-email: mpkasp@gmail.com
-License: GPL 3.0 License
-Platform: UNKNOWN
+Author-email: Mike Kasparian <mpkasp@gmail.com>
+License: GPL-3.0-only
+Project-URL: Homepage, https://www.indabom.com/
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.1
+Classifier: Framework :: Django :: 5
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Django>=5.2
+Requires-Dist: social-auth-app-django<6,>=5
+Requires-Dist: social-auth-core<6,>=4
+Requires-Dist: google-api-python-client>=2
+Requires-Dist: django-materializecss-form
+Requires-Dist: django-money<5,>=3
+Dynamic: license-file
 
 # BOM
 ![](https://github.com/mpkasp/django-bom/workflows/Django%20CI/badge.svg)
@@ -41,16 +51,15 @@ If you already have a django project, you can skip to [Add Django Bom To Your Ap
    * [Installation pitfalls](#installation-pitfalls)
    
 ## Start From Scratch: Add to a new Django project
-1. To start from scratch we recommend setting up a virtual environment
+1. To start from scratch, install your pipenv using Python 3.12
 ```
-virtualenv -p python3 mysite
-cd mysite
-source bin/activate
+pipenv --python 3.12
+pipenv shell
 ```
 
 2. From here install django, and set up your project.
 ```
-pip install django
+pipenv install django
 django-admin startproject mysite
 cd mysite
 python manage.py migrate
@@ -60,7 +69,7 @@ python manage.py createsuperuser # make a user for your development environment
 3. Continue on to [Add Django Bom To Your App](#add-django-bom-to-your-app).
 
 ## Add Django Bom To Your App
-django-bom is a [reusable django application](https://docs.djangoproject.com/en/1.11/intro/reusable-apps/). If you don't already have a django project, you can follow some quick steps below to get up and running, or read about creating your first django app [here](https://docs.djangoproject.com/en/1.11/intro/tutorial01/). Note that django-bom currently supports python 2.7.
+django-bom is a [reusable django application](https://docs.djangoproject.com/en/1.11/intro/reusable-apps/). If you don't already have a django project, you can follow some quick steps below to get up and running, or read about creating your first django app [here](https://docs.djangoproject.com/en/1.11/intro/tutorial01/).
 
 ```
 pip install django-bom
@@ -110,7 +119,7 @@ TEMPLATES = [
 and
 
 ```
-BOM_CONFIG = {}
+BOM_CONFIG = {'standalone_mode': False}
 ```
 
 4. Run `python manage.py migrate` to create the bom models.
@@ -132,7 +141,7 @@ source bin/activate
 2. From here install django, and set up your project.
 ```
 git clone https://github.com/mpkasp/django-bom.git
-pip install -r requirements.txt
+pipenv install
 python manage.py migrate
 cp bom/local_settings.py.example bom/local_settings.py
 python manage.py runserver
@@ -195,5 +204,3 @@ You may get an error during your `pip install -r requirements.txt` related to sq
 
 #### Cryptography
 Sometimes you'll have issues installing cryptography, if this is the case you may just need to set up some environment variables. This [stackoverflow](https://stackoverflow.com/questions/46288737/error-while-installing-sqlite-using-pip-on-python-2-7-13) may help.
-
-

{django-bom-1.228 → django_bom-1.261}/README.md

@@ -19,16 +19,15 @@ If you already have a django project, you can skip to [Add Django Bom To Your Ap
    * [Installation pitfalls](#installation-pitfalls)
    
 ## Start From Scratch: Add to a new Django project
-1. To start from scratch we recommend setting up a virtual environment
+1. To start from scratch, install your pipenv using Python 3.12
 ```
-virtualenv -p python3 mysite
-cd mysite
-source bin/activate
+pipenv --python 3.12
+pipenv shell
 ```
 
 2. From here install django, and set up your project.
 ```
-pip install django
+pipenv install django
 django-admin startproject mysite
 cd mysite
 python manage.py migrate
@@ -38,7 +37,7 @@ python manage.py createsuperuser # make a user for your development environment
 3. Continue on to [Add Django Bom To Your App](#add-django-bom-to-your-app).
 
 ## Add Django Bom To Your App
-django-bom is a [reusable django application](https://docs.djangoproject.com/en/1.11/intro/reusable-apps/). If you don't already have a django project, you can follow some quick steps below to get up and running, or read about creating your first django app [here](https://docs.djangoproject.com/en/1.11/intro/tutorial01/). Note that django-bom currently supports python 2.7.
+django-bom is a [reusable django application](https://docs.djangoproject.com/en/1.11/intro/reusable-apps/). If you don't already have a django project, you can follow some quick steps below to get up and running, or read about creating your first django app [here](https://docs.djangoproject.com/en/1.11/intro/tutorial01/).
 
 ```
 pip install django-bom
@@ -88,7 +87,7 @@ TEMPLATES = [
 and
 
 ```
-BOM_CONFIG = {}
+BOM_CONFIG = {'standalone_mode': False}
 ```
 
 4. Run `python manage.py migrate` to create the bom models.
@@ -110,7 +109,7 @@ source bin/activate
 2. From here install django, and set up your project.
 ```
 git clone https://github.com/mpkasp/django-bom.git
-pip install -r requirements.txt
+pipenv install
 python manage.py migrate
 cp bom/local_settings.py.example bom/local_settings.py
 python manage.py runserver

{django-bom-1.228 → django_bom-1.261}/bom/admin.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
@@ -6,29 +7,31 @@ from .models import (
     Assembly,
     Manufacturer,
     ManufacturerPart,
-    Organization,
     Part,
     PartClass,
     PartRevision,
+    PartRevisionProperty,
+    PartRevisionPropertyDefinition,
     Seller,
     SellerPart,
     Subpart,
-    UserMeta,
+    UnitDefinition,
+    QuantityOfMeasure,
+    get_organization_model,
+    get_user_meta_model
 )
 
-
 User = get_user_model()
+UserMeta = get_user_meta_model()
+Organization = get_organization_model()
 
 class UserMetaInline(admin.TabularInline):
     model = UserMeta
+    verbose_name = 'BOM User Meta'
     raw_id_fields = ('organization',)
     can_delete = False
 
 
-class UserAdmin(UserAdmin):
-    inlines = (UserMetaInline,)
-
-
 class OrganizationAdmin(admin.ModelAdmin):
     list_display = ('name',)
 
@@ -52,6 +55,7 @@ class SellerPartAdmin(admin.ModelAdmin):
     list_display = (
         'manufacturer_part',
         'seller',
+        'seller_part_number',
         'minimum_order_quantity',
         'minimum_pack_quantity',
         'unit_cost',
@@ -87,7 +91,10 @@ class PartClassAdmin(admin.ModelAdmin):
 
 class PartRevisionAdminInline(admin.TabularInline):
     model = PartRevision
+    extra = 0
     raw_id_fields = ('assembly',)
+    readonly_fields = ('timestamp',)
+    show_change_link = True
 
 
 class PartAdmin(admin.ModelAdmin):
@@ -97,8 +104,10 @@ class PartAdmin(admin.ModelAdmin):
         'organization',
         'get_full_part_number',
     )
+    list_filter = ('organization', 'number_class',)
     raw_id_fields = ('number_class', 'primary_manufacturer_part',)
     inlines = [
+        PartRevisionAdminInline,
         ManufacturerPartAdminInline,
     ]
 
@@ -109,10 +118,22 @@ class PartAdmin(admin.ModelAdmin):
     get_full_part_number.admin_order_field = 'number_class__part_number'
 
 
+class QuantityOfMeasureAdmin(admin.ModelAdmin):
+    list_display = ('name', 'organization')
+    list_filter = ('organization',)
+
+
+class PartRevisionPropertyInline(admin.TabularInline):
+    model = PartRevisionProperty
+    extra = 1
+    raw_id_fields = ('property_definition', 'part_revision', 'unit_definition')
+
+
 class PartRevisionAdmin(admin.ModelAdmin):
     list_display = ('part', 'revision', 'description', 'get_assembly_size', 'timestamp',)
     raw_id_fields = ('assembly',)
     readonly_fields = ('timestamp',)
+    inlines = [PartRevisionPropertyInline]
 
     def get_assembly_size(self, obj):
         return None if obj.assembly is None else obj.assembly.subparts.count()
@@ -141,14 +162,37 @@ class AssemblyAdmin(admin.ModelAdmin):
     ]
 
 
-# Try to unregister User model
-try:
-    admin.site.unregister(User)
-except admin.sites.NotRegistered:
-    pass
+class UnitDefinitionAdmin(admin.ModelAdmin):
+    list_display = ('name', 'symbol', 'quantity_of_measure', 'base_multiplier', 'organization')
+    list_filter = ('organization',)
+
+
+class PartRevisionPropertyDefinitionAdmin(admin.ModelAdmin):
+    list_display = ('code', 'name', 'type', 'organization', 'quantity_of_measure')
+    list_filter = ('organization',)
+
+
+if settings.BOM_USER_META_MODEL == 'bom.UserMeta':
+    current_user_admin = admin.site._registry.get(User)
+
+    if current_user_admin:
+        user_admin_class = current_user_admin.__class__
+        existing_inlines = list(user_admin_class.inlines or [])
+        if UserMetaInline not in existing_inlines:
+            existing_inlines.append(UserMetaInline)
+            user_admin_class.inlines = existing_inlines
+    else:
+        class BomUserAdmin(UserAdmin):
+            inlines = [UserMetaInline]
+
+
+        admin.site.register(User, BomUserAdmin)
+
+if settings.BOM_ORGANIZATION_MODEL == 'bom.Organization':
+    from .models import Organization
+
+    admin.site.register(Organization, OrganizationAdmin)
 
-admin.site.register(User, UserAdmin)
-admin.site.register(Organization, OrganizationAdmin)
 admin.site.register(Seller, SellerAdmin)
 admin.site.register(SellerPart, SellerPartAdmin)
 admin.site.register(ManufacturerPart, ManufacturerPartAdmin)
@@ -158,3 +202,6 @@ admin.site.register(PartRevision, PartRevisionAdmin)
 admin.site.register(Manufacturer, ManufacturerAdmin)
 admin.site.register(Assembly, AssemblyAdmin)
 admin.site.register(Subpart, SubpartAdmin)
+admin.site.register(UnitDefinition, UnitDefinitionAdmin)
+admin.site.register(PartRevisionPropertyDefinition, PartRevisionPropertyDefinitionAdmin)
+admin.site.register(QuantityOfMeasure, QuantityOfMeasureAdmin)

django_bom-1.261/bom/auth_backends.py

@@ -0,0 +1,47 @@
+from typing import Optional
+
+from . import constants
+from .models import get_organization_model
+
+Organization = get_organization_model()
+
+
+class OrganizationPermissionBackend:
+    """
+    Object-level permission backend for django-bom.
+
+    - Uses Django's has_perm(user, perm, obj) to evaluate permissions tied to an Organization.
+    - Superusers are granted all permissions.
+    - For `bom.manage_members`: User must be owner or admin within the organization.
+    """
+
+    def authenticate(self, request, **credentials):  # pragma: no cover - not used for auth
+        return None
+
+    def has_perm(self, user_obj, perm: str, obj: Optional[object] = None):
+        # Only handle our specific object-level permission. Let other backends process others.
+        if not user_obj or not user_obj.is_authenticated:
+            return False
+
+        if user_obj.is_superuser:
+            return True
+
+        if perm != 'bom.manage_members':
+            return None
+
+        if obj is None or not isinstance(obj, Organization):
+            return False
+
+        profile = user_obj.bom_profile()
+        if not profile or profile.organization_id != obj.id:
+            return False
+
+        if obj.subscription != constants.SUBSCRIPTION_TYPE_PRO:
+            return False
+
+        is_owner = obj.owner_id == user_obj.id
+        is_admin = getattr(profile, 'role', None) == constants.ROLE_TYPE_ADMIN
+        if not (is_owner or is_admin):
+            return False
+
+        return True

{django-bom-1.228 → django_bom-1.261}/bom/constants.py

@@ -34,6 +34,13 @@ DATA_SOURCES = (
     (DATA_SOURCE_MOUSER, 'mouser'),
 )
 
+PART_REVISION_PROPERTY_TYPE_STRING = 'S'
+PART_REVISION_PROPERTY_TYPE_DECIMAL = 'D'
+PART_REVISION_PROPERTY_TYPE_BOOLEAN = 'B'
+PART_REVISION_PROPERTY_TYPES = ((PART_REVISION_PROPERTY_TYPE_STRING, 'String'),
+                                (PART_REVISION_PROPERTY_TYPE_DECIMAL, 'Number'),
+                                (PART_REVISION_PROPERTY_TYPE_BOOLEAN, 'Boolean'),)
+
 VALUE_UNITS = (
     NO_CHOICE,
     ('Ohms', '\u03A9'),
@@ -92,6 +99,8 @@ PACKAGE_TYPES = (
     ('QFT', 'QFT'),
     ('PLCC', 'PLCC'),
     ('VGA', 'VGA'),
+    ('BGA', 'BGA'),
+    ('CSP', 'CSP'),
     ('Other', 'Other'),
 )
 

{django-bom-1.228 → django_bom-1.261}/bom/csv_headers.py

@@ -35,8 +35,11 @@ class CSVHeader:
 class CSVHeaders(ABC):
     all_headers_defns = []
 
+    def __init__(self, *args, **kwargs):
+        self.headers_defns = list(self.all_headers_defns)
+
     def get_synoynms(self, hdr_name):
-        for defn in self.all_headers_defns:
+        for defn in self.headers_defns:
             if hdr_name in defn:
                 return defn.synonyms()
             else:
@@ -53,7 +56,7 @@ class CSVHeaders(ABC):
 
     # Preserves order of definitions as listed in all_header_defns:
     def get_default_all(self):
-        return [d.name for d in self.all_headers_defns]
+        return [d.name for d in self.headers_defns]
 
     # Given a list of header names returns the default name for each. The return list
     # matches the order of the input list. If a name is not recognized, then returns
@@ -151,6 +154,9 @@ class CSVHeaders(ABC):
                 return True
         raise CSVHeaderError(f'Missing column named {header}')
 
+    def add_header(self, header):
+        self.headers_defns.append(header)
+
 
 #
 # For each CSV header class, a static data member dictionary uses the key as the default name for the header while the
@@ -172,6 +178,7 @@ class ManufacturerPartCSVHeaders(CSVHeaders):
 class SellerPartCSVHeaders(CSVHeaders):
     all_headers_defns = [
         CSVHeader('seller', name_options=['part_seller', 'part_seller_name', ]),
+        CSVHeader('seller_part_number', name_options=['seller_pn', 'spn', 'pn', 'part_seller_part_number', 'seller_part_number', ]),
         CSVHeader('unit_cost', name_options=['seller_part_unit_cost', 'unit_cost', 'part_cost', ]),
         CSVHeader('minimum_order_quantity', name_options=['minimum_order_quantity', 'moq', 'part_moq', ]),
         CSVHeader('nre_cost', name_options=['part_nre', 'part_nre_cost', 'nre', 'nre_cost', ]),
@@ -189,52 +196,25 @@ class PartClassesCSVHeaders(CSVHeaders):
     ]
 
 
-class PartsListCSVHeaders(CSVHeaders):
-    part_attributes = [
-        CSVHeader('value', name_options=['val', 'val.', ]),
-        CSVHeader('value_units', name_options=['value units', 'val. units', 'val units', ]),
-        CSVHeader('tolerance', name_options=[]),
-        CSVHeader('attribute', name_options=[]),
-        CSVHeader('package', name_options=[]),
-        CSVHeader('pin_count', name_options=[]),
-        CSVHeader('frequency', name_options=[]),
-        CSVHeader('frequency_units', name_options=[]),
-        CSVHeader('wavelength', name_options=[]),
-        CSVHeader('wavelength_units', name_options=[]),
-        CSVHeader('memory', name_options=[]),
-        CSVHeader('memory_units', name_options=[]),
-        CSVHeader('interface', name_options=[]),
-        CSVHeader('supply_voltage', name_options=[]),
-        CSVHeader('supply_voltage_units', name_options=[]),
-        CSVHeader('temperature_rating', name_options=[]),
-        CSVHeader('temperature_rating_units', name_options=[]),
-        CSVHeader('power_rating', name_options=[]),
-        CSVHeader('power_rating_units', name_options=[]),
-        CSVHeader('voltage_rating', name_options=[]),
-        CSVHeader('voltage_rating_units', name_options=[]),
-        CSVHeader('current_rating', name_options=[]),
-        CSVHeader('current_rating_units', name_options=[]),
-        CSVHeader('material', name_options=[]),
-        CSVHeader('color', name_options=[]),
-        CSVHeader('finish', name_options=[]),
-        CSVHeader('length', name_options=[]),
-        CSVHeader('length_units', name_options=[]),
-        CSVHeader('width', name_options=[]),
-        CSVHeader('width_units', name_options=[]),
-        CSVHeader('height', name_options=[]),
-        CSVHeader('height_units', name_options=[]),
-        CSVHeader('weight', name_options=[]),
-        CSVHeader('weight_units', name_options=[]),
-    ]
+class PartRevisionPropertyCSVHeaders(CSVHeaders):
+    def add_dynamic_headers(self, definitions):
+        for defn in definitions:
+            self.add_header(
+                CSVHeader(defn.form_field_name,
+                          name_options=[defn.name, f'property_{defn.code}', f'property_{defn.name}', 'p']))
+            if defn.quantity_of_measure:
+                self.add_header(
+                    CSVHeader(defn.form_unit_field_name, name_options=[f'{defn.name} Units', f'{defn.code}_units']))
+
 
+class PartsListCSVHeaders(PartRevisionPropertyCSVHeaders):
     all_headers_defns = [
         CSVHeader('description', name_options=['desc', 'desc.', ]),
         CSVHeader('manufacturer_name', name_options=['mfg_name', 'manufacturer_name', 'part_manufacturer', 'mfg', 'manufacturer', 'manufacturer name', ]),
         CSVHeader('manufacturer_part_number', name_options=['mpn', 'mfg_part_number', 'part_manufacturer_part_number', 'mfg part number', 'manufacturer part number']),
         CSVHeader('part_number', name_options=['part number', 'part no', ]),
         CSVHeader('revision', name_options=['rev', 'part_revision', ]),
-    ] + part_attributes \
-      + SellerPartCSVHeaders.all_headers_defns
+                        ] + SellerPartCSVHeaders.all_headers_defns
 
 
 class PartsListCSVHeadersSemiIntelligent(PartsListCSVHeaders):
@@ -245,11 +225,10 @@ class PartsListCSVHeadersSemiIntelligent(PartsListCSVHeaders):
         CSVHeader('part_class', name_options=['class', 'part_category']),
         CSVHeader('part_number', name_options=['part number', 'part no', ]),
         CSVHeader('revision', name_options=['rev', 'part_revision', ]),
-    ] + PartsListCSVHeaders.part_attributes \
-      + SellerPartCSVHeaders.all_headers_defns
+                        ] + SellerPartCSVHeaders.all_headers_defns
 
 
-class BOMFlatCSVHeaders(CSVHeaders):
+class BOMFlatCSVHeaders(PartRevisionPropertyCSVHeaders):
     all_headers_defns = [
         CSVHeader('part_number', name_options=['part number', 'part no', ]),
         CSVHeader('quantity', name_options=['count', 'qty', 'quantity', ]),