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

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

@@ -1,24 +1,34 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-bom
-Version: 1.228
+Version: 1.255
 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.3,>=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.255}/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.255}/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,27 @@ from .models import (
     Assembly,
     Manufacturer,
     ManufacturerPart,
-    Organization,
     Part,
     PartClass,
     PartRevision,
     Seller,
     SellerPart,
     Subpart,
-    UserMeta,
+    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 +51,7 @@ class SellerPartAdmin(admin.ModelAdmin):
     list_display = (
         'manufacturer_part',
         'seller',
+        'seller_part_number',
         'minimum_order_quantity',
         'minimum_pack_quantity',
         'unit_cost',
@@ -141,14 +141,27 @@ class AssemblyAdmin(admin.ModelAdmin):
     ]
 
 
-# Try to unregister User model
-try:
-    admin.site.unregister(User)
-except admin.sites.NotRegistered:
-    pass
+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)

django_bom-1.255/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.255}/bom/constants.py

@@ -92,6 +92,8 @@ PACKAGE_TYPES = (
     ('QFT', 'QFT'),
     ('PLCC', 'PLCC'),
     ('VGA', 'VGA'),
+    ('BGA', 'BGA'),
+    ('CSP', 'CSP'),
     ('Other', 'Other'),
 )
 

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

@@ -172,6 +172,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', ]),

{django-bom-1.228 → django_bom-1.255}/bom/forms.py

@@ -1,41 +1,27 @@
 import codecs
 import csv
 import logging
-from typing import Type, TypeVar
 
 from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.core.exceptions import ValidationError
-from django.core.validators import MaxLengthValidator, MaxValueValidator, MinLengthValidator, MinValueValidator
+from django.core.validators import MaxLengthValidator, MinLengthValidator
 from django.db import IntegrityError
 from django.forms.models import model_to_dict
 from django.utils.translation import gettext_lazy as _
-
 from djmoney.money import Money
 
 from .constants import (
-    CONFIGURATION_TYPES,
     CURRENT_UNITS,
     DISTANCE_UNITS,
     FREQUENCY_UNITS,
     INTERFACE_TYPES,
     MEMORY_UNITS,
-    NUMBER_CLASS_CODE_LEN_DEFAULT,
-    NUMBER_CLASS_CODE_LEN_MAX,
-    NUMBER_CLASS_CODE_LEN_MIN,
-    NUMBER_ITEM_LEN_DEFAULT,
-    NUMBER_ITEM_LEN_MAX,
-    NUMBER_ITEM_LEN_MIN,
     NUMBER_SCHEME_INTELLIGENT,
     NUMBER_SCHEME_SEMI_INTELLIGENT,
-    NUMBER_VARIATION_LEN_DEFAULT,
-    NUMBER_VARIATION_LEN_MAX,
-    NUMBER_VARIATION_LEN_MIN,
     PACKAGE_TYPES,
     POWER_UNITS,
     ROLE_TYPE_VIEWER,
-    ROLE_TYPES,
-    SUBSCRIPTION_TYPES,
     TEMPERATURE_UNITS,
     VALUE_UNITS,
     VOLTAGE_UNITS,
@@ -43,11 +29,9 @@ from .constants import (
     WEIGHT_UNITS,
 )
 from .csv_headers import (
-    BOMFlatCSVHeaders,
     BOMIndentedCSVHeaders,
     CSVHeaderError,
     PartClassesCSVHeaders,
-    PartsListCSVHeaders,
 )
 from .form_fields import AutocompleteTextInput
 from .models import (
@@ -55,7 +39,6 @@ from .models import (
     AssemblySubparts,
     Manufacturer,
     ManufacturerPart,
-    Organization,
     Part,
     PartClass,
     PartRevision,
@@ -63,20 +46,18 @@ from .models import (
     SellerPart,
     Subpart,
     User,
-    UserMeta,
+    get_user_meta_model,
+    get_organization_model,
 )
 from .utils import (
-    check_references_for_duplicates,
-    get_from_dict,
     listify_string,
-    prep_for_sorting_nicely,
     stringify_list,
 )
-from .validators import alphanumeric, decimal, numeric
-
+from .validators import alphanumeric
 
 logger = logging.getLogger(__name__)
-
+Organization = get_organization_model()
+UserMeta = get_user_meta_model()
 
 class UserModelChoiceField(forms.ModelChoiceField):
     def label_from_instance(self, user):
@@ -205,7 +186,8 @@ class OrganizationCreateForm(forms.ModelForm):
 class OrganizationForm(forms.ModelForm):
     class Meta:
         model = Organization
-        exclude = ['owner', 'subscription', 'subscription_quantity', 'google_drive_parent', 'number_scheme', ]
+        # exclude = ['owner', 'subscription', 'subscription_quantity', 'google_drive_parent', 'number_scheme', ]
+        fields = ['name', 'number_class_code_len', 'number_item_len', 'number_variation_len', ]
         labels = {
             "name": "Organization Name",
             "number_class_code_len": "Number Class Code Length (C)",
@@ -230,7 +212,7 @@ class OrganizationFormEditSettings(OrganizationForm):
 
     class Meta:
         model = Organization
-        exclude = ['subscription', 'subscription_quantity', 'google_drive_parent', 'number_scheme', 'number_item_len', 'number_class_code_len', 'number_variation_len', 'owner', ]
+        fields = ['name', 'owner', 'currency']
         labels = {
             "name": "Organization Name",
         }
@@ -571,6 +553,7 @@ class PartCSVForm(forms.Form):
                 value = csv_headers.get_val_from_row(part_data, 'value')
                 value_units = csv_headers.get_val_from_row(part_data, 'value_units')
                 seller_name = csv_headers.get_val_from_row(part_data, 'seller')
+                seller_part_number = csv_headers.get_val_from_row(part_data, 'seller_part_number')
                 unit_cost = csv_headers.get_val_from_row(part_data, 'unit_cost')
                 nre_cost = csv_headers.get_val_from_row(part_data, 'part_nre_cost')
                 moq = csv_headers.get_val_from_row(part_data, 'moq')
@@ -746,7 +729,7 @@ class PartCSVForm(forms.Form):
 
                         if seller_name and unit_cost and nre_cost:
                             seller, created = Seller.objects.get_or_create(name__iexact=seller_name, organization=self.organization, defaults={'name': seller_name})
-                            seller_part, created = SellerPart.objects.get_or_create(manufacturer_part=manufacturer_part, seller=seller, unit_cost=unit_cost, nre_cost=nre_cost, minimum_order_quantity=moq, minimum_pack_quantity=mpq)
+                            seller_part, created = SellerPart.objects.get_or_create(manufacturer_part=manufacturer_part, seller=seller, seller_part_number=seller_part_number, unit_cost=unit_cost, nre_cost=nre_cost, minimum_order_quantity=moq, minimum_pack_quantity=mpq)
 
                     self.successes.append("Part {0} on row {1} created.".format(part.full_part_number(), row_count))
                 else:

{django-bom-1.228 → django_bom-1.255}/bom/helpers.py

@@ -191,7 +191,8 @@ def create_some_fake_parts(organization):
 
     (s1, s2, s3) = create_some_fake_sellers(organization=organization)
 
-    create_a_fake_seller_part(s1, mp1, moq=1, mpq=1, unit_cost=0, lead_time_days=None, nre_cost=0,)
+    create_a_fake_seller_part(s1, mp1, moq=0, mpq=1, unit_cost=0, lead_time_days=None, nre_cost=0,)
+    create_a_fake_seller_part(s1, mp1, moq=1, mpq=2, unit_cost=10, lead_time_days=None, nre_cost=0, )
     create_a_fake_seller_part(s1, mp1, moq=1, mpq=1, unit_cost=1.2, lead_time_days=20, nre_cost=500)
     create_a_fake_seller_part(s2, mp1, moq=1000, mpq=5000, unit_cost=0.1005, lead_time_days=7, nre_cost=0)
     create_a_fake_seller_part(s2, mp2, moq=200, mpq=200, unit_cost=0.5, lead_time_days=47, nre_cost=1)

django_bom-1.255/bom/local_settings.py

@@ -0,0 +1,35 @@
+from pathlib import Path
+
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'supersecretkey'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = ['*']
+
+BOM_CONFIG = {
+    'mouser_api_key': 'secretkey',
+    'admin_dashboard': {
+        'enable_autocomplete': False,
+        'page_size': 50,
+    }
+}
+
+# google GoogleOAuth
+SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = 'secretkey'
+SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = 'secretkey'
+
+# Database
+# https://docs.djangoproject.com/en/1.10/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+FIXER_ACCESS_KEY = 'secretkey from fixer.io' # for exchange rate conversions

django_bom-1.255/bom/migrations/0046_alter_sellerpart_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.16 on 2023-01-29 21:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bom', '0045_sellerpart_link'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='sellerpart',
+            unique_together=set(),
+        ),
+    ]

django_bom-1.255/bom/migrations/0047_sellerpart_seller_part_number.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2023-03-07 17:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bom', '0046_alter_sellerpart_unique_together'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sellerpart',
+            name='seller_part_number',
+            field=models.CharField(blank=True, default='', max_length=64, null=True),
+        ),
+    ]