irie 0.0.23__tar.gz → 0.0.67__tar.gz

{irie-0.0.23 → irie-0.0.67}/PKG-INFO

@@ -1,15 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: irie
-Version: 0.0.23
+Version: 0.0.67
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
 Project-URL: Documentation, https://stairlab.berkeley.edu/software/irie/
-Keywords: visualization,seismic,opensees,resilience,post-processing,finite-element-analysis,glTF
+Keywords: resilience,structural-health-monitoring,finite-element-analysis,xara
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -27,12 +26,16 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Description-Content-Type: text/markdown
-Requires-Dist: tqdm
-Requires-Dist: opensees
+Requires-Dist: opensees>=0.1.0
 Requires-Dist: quakeio
+Requires-Dist: veux>=0.0.40
+Requires-Dist: xara>=0.0.8
+Requires-Dist: xcsi>=0.0.5
 Requires-Dist: mdof
-Requires-Dist: bottle
+Requires-Dist: xsection>=0.0.20
 Requires-Dist: openbim
+Requires-Dist: openpyxl
+Requires-Dist: tqdm
 Requires-Dist: folium
 Requires-Dist: pandas
 Requires-Dist: numpy
@@ -40,7 +43,7 @@ Requires-Dist: orjson
 Requires-Dist: jsonschema
 Requires-Dist: beautifulsoup4
 Requires-Dist: autopep8
-Requires-Dist: Django==5.1.2
+Requires-Dist: Django==5.2.2
 Requires-Dist: asgiref==3.8.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: pytz==2021.3
@@ -54,6 +57,7 @@ Requires-Dist: django-environ==0.11.2
 Requires-Dist: djangorestframework==3.15.2
 Requires-Dist: djangorestframework-simplejwt==5.3.1
 Requires-Dist: dj-database-url==2.1.0
+Requires-Dist: django-formtools
 
 <div align="center">
 <h4><code>irie</code></h4>
@@ -68,8 +72,7 @@ Requires-Dist: dj-database-url==2.1.0
 - [`opensees`](https://pypi.org/project/opensees)
 - [`quakeio`](https://pypi.org/project/quakeio)
 - [`mdof`](https://pypi.org/project/mdof)
-- [`sees`](https://pypi.org/project/sees)
-- [`sdof`](https://pypi.org/project/sdof)
+- [`veux`](https://veux.io/)
 
 
 <table align="center">

{irie-0.0.23 → irie-0.0.67}/README.md

@@ -11,8 +11,7 @@
 - [`opensees`](https://pypi.org/project/opensees)
 - [`quakeio`](https://pypi.org/project/quakeio)
 - [`mdof`](https://pypi.org/project/mdof)
-- [`sees`](https://pypi.org/project/sees)
-- [`sdof`](https://pypi.org/project/sdof)
+- [`veux`](https://veux.io/)
 
 
 <table align="center">

{irie-0.0.23 → irie-0.0.67}/pyproject.toml

@@ -1,31 +1,32 @@
 [project]
 name = "irie"
-version = "0.0.23"
+version = "0.0.67"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
 description="An infrastructure resilience engine"
 
-license = {file = ".github/LICENSE.txt"}
 readme = "README.md"
 
 keywords = [
-  "visualization",
-  "seismic",
-  "opensees",
   "resilience",
-  "post-processing",
+  "structural-health-monitoring",
   "finite-element-analysis",
-  "glTF"
+  "xara"
 ] 
 
 dependencies = [
-  "tqdm",
-  "opensees",
+  "opensees>=0.1.0",
   "quakeio",
+  "veux>=0.0.40",
+  "xara>=0.0.8",
+  "xcsi>=0.0.5",
   "mdof",
-  "bottle",
-  "openbim",
+  "xsection>=0.0.20",
+  "openbim", # TODO: remove, superceded by xcsi
+  "openpyxl", # temporary
+
+  "tqdm",
   "folium",
   "pandas",
   "numpy",
@@ -34,7 +35,7 @@ dependencies = [
   "beautifulsoup4",
   "autopep8",
 
-  "Django==5.1.2",
+  "Django==5.2.2",
   "asgiref==3.8.1",
   "gunicorn==23.0.0",
   "pytz==2021.3",
@@ -47,14 +48,14 @@ dependencies = [
   "django-environ==0.11.2",
   "djangorestframework==3.15.2",
   "djangorestframework-simplejwt==5.3.1",
-  "dj-database-url==2.1.0"
+  "dj-database-url==2.1.0",
+  "django-formtools"
 ]
 
 classifiers = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Science/Research',
     'Intended Audience :: Developers',
-    'License :: OSI Approved :: BSD License',
     'Programming Language :: C',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',

irie-0.0.67/src/irie/apps/admin_dash/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+class AdminDashConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'irie.apps.admin_dash'
+    icon = 'fa fa-user'

irie-0.0.67/src/irie/apps/admin_dash/forms.py

@@ -0,0 +1,67 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm, PasswordChangeForm, SetPasswordForm, PasswordResetForm, UsernameField
+from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
+
+class RegistrationForm(UserCreationForm):
+  password1 = forms.CharField(
+      label=_("Password"),
+      widget=forms.PasswordInput(attrs={'class': 'form-control'}),
+  )
+  password2 = forms.CharField(
+      label=_("Password Confirmation"),
+      widget=forms.PasswordInput(attrs={'class': 'form-control'}),
+  )
+
+  class Meta:
+    model = User
+    fields = ('username', 'email', )
+
+    widgets = {
+      'username': forms.TextInput(attrs={
+          'class': 'form-control'
+      }),
+      'email': forms.EmailInput(attrs={
+          'class': 'form-control'
+      })
+    }
+
+class LoginForm(AuthenticationForm):
+    username = UsernameField(widget=forms.TextInput(attrs={
+        'class': 'form-control'
+    }))
+    password = forms.CharField(max_length=50, widget=forms.PasswordInput(attrs={
+        'class': 'form-control'
+    }))
+
+
+class UserPasswordResetForm(PasswordResetForm):
+  email = forms.EmailField(widget=forms.EmailInput(attrs={
+    'class': 'form-control',
+    'placeholder': 'Email'
+  }))
+
+class UserSetPasswordForm(SetPasswordForm):
+    new_password1 = forms.CharField(max_length=50, widget=forms.PasswordInput(attrs={
+        'class': 'form-control',
+        'placeholder': 'New Password'
+    }), label="New Password")
+    new_password2 = forms.CharField(max_length=50, widget=forms.PasswordInput(attrs={
+        'class': 'form-control',
+        'placeholder': 'Confirm New Password'
+    }), label="Confirm New Password")
+    
+
+class UserPasswordChangeForm(PasswordChangeForm):
+    old_password = forms.CharField(max_length=50, widget=forms.PasswordInput(attrs={
+        'class': 'form-control',
+        'placeholder': 'Old Password'
+    }), label='Old Password')
+    new_password1 = forms.CharField(max_length=50, widget=forms.PasswordInput(attrs={
+        'class': 'form-control',
+        'placeholder': 'New Password'
+    }), label="New Password")
+    new_password2 = forms.CharField(max_length=50, widget=forms.PasswordInput(attrs={
+        'class': 'form-control',
+        'placeholder': 'Confirm New Password'
+    }), label="Confirm New Password")

irie-0.0.67/src/irie/apps/admin_dash/templatetags/admin_material.py

@@ -0,0 +1,86 @@
+import re
+from django import template
+from django.utils.html import format_html
+from django.utils.safestring import mark_safe
+from django.contrib.admin.views.main import PAGE_VAR
+from irie.apps.admin_dash.utils import get_menu_items
+
+register = template.Library()
+assignment_tag = register.assignment_tag if hasattr(register, 'assignment_tag') else register.simple_tag
+
+
+@register.filter
+def clean_text(value):
+    res = value.replace('\n', ' ')
+    return res
+
+
+@register.filter
+def checkbox(value):
+    res = re.sub(r"</?(?i:td)(.|\n)*?>", "", value)
+    return res
+
+
+@assignment_tag(takes_context=True)
+def admin_get_menu(context):
+    return get_menu_items(context)
+
+
+@assignment_tag(takes_context=True)
+def get_direction(context):
+    res = {
+        'panel': 'text-left',
+        'notify': 'right',
+        'float': 'float-right',
+        'reverse_panel': 'text-right',
+        'nav': 'ml-auto'
+    }
+
+    if context.get('LANGUAGE_BIDI'):
+        res['panel'] = 'text-right'
+        res['notify'] = 'left'
+        res['float'] = ''
+        res['reverse_panel'] = 'text-left'
+        res['nav'] = 'mr-auto'
+    return res
+
+
+@assignment_tag(takes_context=True)
+def get_admin_setting(context):
+    # user = context.get('request').user
+    # admin_black_setting = user.admin_black_setting if hasattr(user, 'admin_black_setting') else None
+    res = {
+        # 'sidebar_background': admin_black_setting.sidebar_background if admin_black_setting else 'primary',
+        # 'dark_mode': admin_black_setting.dark_mode if admin_black_setting else True,
+        # 'input_bg_color': '#ffffff' if admin_black_setting and not admin_black_setting.dark_mode else '#27293c'
+    }
+
+    return res
+
+
+@register.simple_tag
+def paginator_number(cl, i):
+    """
+    Generate an individual page index link in a paginated list.
+    """
+    if i == cl.paginator.ELLIPSIS:
+        return format_html('{} ', cl.paginator.ELLIPSIS)
+    elif i == cl.page_num:
+        return format_html('<a href="" class="page-link">{}</a> ', i)
+    else:
+        return format_html(
+            '<a href="{}" class="page-link {}">{}</a> ',
+            cl.get_query_string({PAGE_VAR: i}),
+            mark_safe('end' if i == cl.paginator.num_pages else ''),
+            i,
+        )
+
+
+@register.filter
+def sum_number(value, number):
+    return value + number
+
+
+@register.filter
+def neg_num(value, number):
+    return value - number

irie-0.0.67/src/irie/apps/admin_dash/templatetags/replace_value.py

@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter(name="replace_value")
+def replace_value(value, arg):
+  return value.replace(arg, " ").title()

irie-0.0.67/src/irie/apps/admin_dash/urls.py

@@ -0,0 +1,36 @@
+from django.urls import path
+from irie.apps.admin_dash import views
+from django.contrib.auth import views as auth_views
+
+
+urlpatterns = [
+    path('', views.index, name="index"),
+    path('tables/', views.tables, name="tables"),
+    path('billing/', views.billing, name="billing"),
+    path('virtual-reality/', views.virtual_reality, name="virtual_reality"),
+    path('rtl/', views.rtl, name="rtl"),
+    path('notifications/', views.notifications, name="notifications"),
+    path('profile/', views.profile, name="profile"),
+    path('map/', views.map, name="map"),
+    path('icons/', views.icons, name="icons"),
+    path('typography/', views.typography, name="typography"),
+    path('template/', views.template, name="template"),
+
+    # Authentication
+    path('accounts/register/', views.register, name='register'),
+    path('accounts/login/', views.UserLoginView.as_view(), name='login'),
+    path('accounts/logout/', views.user_logout_view, name='logout'),
+    path('accounts/password-change/', views.UserPasswordChangeView.as_view(), name='password_change'),
+    path('accounts/password-change-done/', auth_views.PasswordChangeDoneView.as_view(
+        template_name='pages/password_change_done.html'
+    ), name="password_change_done" ),
+    path('accounts/password-reset/', views.UserPasswordResetView.as_view(), name='password_reset'),
+    path('accounts/password-reset-confirm/<uidb64>/<token>/', 
+        views.UserPasswordResetConfirmView.as_view(), name='password_reset_confirm'),
+    path('accounts/password-reset-done/', auth_views.PasswordResetDoneView.as_view(
+        template_name='pages/password_reset_done.html'
+    ), name='password_reset_done'),
+    path('accounts/password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(
+        template_name='pages/password_reset_complete.html'
+    ), name='password_reset_complete'),
+]