localcosmos-app-kit 0.9.10__py3-none-any.whl → 0.9.11__py3-none-any.whl

app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py

@@ -99,7 +99,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
 
     def get_vernacular_name_from_nature_guides(self, lazy_taxon):
         if lazy_taxon.name_uuid in self.vernacular_names_from_nature_guide_cache:
-            return self.vernacular_names_from_nature_guide_cache[lazy_taxon.name_uuid]
+            return self.vernacular_names_from_nature_guide_cache[str(lazy_taxon.name_uuid)]
         
         return lazy_taxon.get_primary_locale_vernacular_name_from_nature_guides(self.meta_app)
     
@@ -158,7 +158,6 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
                 'metaDescription': None,
             },
             'externalMedia': [],
-            'templateContents': [],
             'morphotypeProfiles': [],
             'isFeatured': is_featured,
         })
@@ -433,7 +432,7 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
                     if vernacular_start_letter not in start_letters['vernacular'][language_code]:
                         start_letters['vernacular'][language_code].append(vernacular_start_letter)
 
-            included_taxa.append(lazy_taxon.name_uuid)
+            included_taxa.append(str(lazy_taxon.name_uuid))
 
         # sort the localited registries
         for language_code, localized_registry in localized_registries.items():

app_kit/appbuilder/TaxonBuilder.py

@@ -111,19 +111,19 @@ class TaxonSerializer:
     
     def serialize(self):
         
-        if self.lazy_taxon.name_uuid in self.taxa_builder.cache['simple']:
-            taxon_json = self.taxa_builder.cache['simple'][self.lazy_taxon.name_uuid]
+        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['simple']:
+            taxon_json = self.taxa_builder.cache['simple'][str(self.lazy_taxon.name_uuid)]
         
         else:
             taxon_json = {
                 'taxonLatname' : self.lazy_taxon.taxon_latname,
                 'taxonAuthor' : self.lazy_taxon.taxon_author,
                 'taxonSource' : self.lazy_taxon.taxon_source,
-                'nameUuid' : self.lazy_taxon.name_uuid,
+                'nameUuid' : str(self.lazy_taxon.name_uuid),
                 'taxonNuid' : self.lazy_taxon.taxon_nuid,
             }
             
-            self.taxa_builder.cache['simple'][self.lazy_taxon.name_uuid] = taxon_json
+            self.taxa_builder.cache['simple'][str(self.lazy_taxon.name_uuid)] = taxon_json
         
         taxon_json_copy = copy.deepcopy(taxon_json)
         
@@ -173,8 +173,8 @@ class TaxonSerializer:
 
     def serialize_extended(self):
         
-        if self.lazy_taxon.name_uuid in self.taxa_builder.cache['extended']:
-            taxon_json = self.taxa_builder.cache['extended'][self.lazy_taxon.name_uuid]
+        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['extended']:
+            taxon_json = self.taxa_builder.cache['extended'][str(self.lazy_taxon.name_uuid)]
             
         else:
         
@@ -201,7 +201,7 @@ class TaxonSerializer:
                 taxon_json['shortProfile'] = taxon_profile.short_profile
             
             
-            self.taxa_builder.cache['extended'][self.lazy_taxon.name_uuid] = taxon_json
+            self.taxa_builder.cache['extended'][str(self.lazy_taxon.name_uuid)] = taxon_json
 
         taxon_json_copy = copy.deepcopy(taxon_json)
         
@@ -222,8 +222,8 @@ class TaxonSerializer:
     
     def serialize_images(self):
         
-        if self.lazy_taxon.name_uuid in self.taxa_builder.cache['images']:
-            taxon_images = self.taxa_builder.cache['images'][self.lazy_taxon.name_uuid]
+        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['images']:
+            taxon_images = self.taxa_builder.cache['images'][str(self.lazy_taxon.name_uuid)]
         
         else:
                 
@@ -314,7 +314,7 @@ class TaxonSerializer:
                     collected_content_image_ids.add(taxon_image.id)
                     collected_image_store_ids.add(taxon_image.image_store.id)
     
-            self.taxa_builder.cache['images'][self.lazy_taxon.name_uuid] = taxon_images
+            self.taxa_builder.cache['images'][str(self.lazy_taxon.name_uuid)] = taxon_images
             
         taxon_images_copy = copy.deepcopy(taxon_images)
         
@@ -334,6 +334,9 @@ class TaxonSerializer:
             if not accepted_name_uuid:
                 accepted_name_uuid = self.lazy_taxon.name_uuid
                 
+            if accepted_name_uuid:
+                accepted_name_uuid = str(accepted_name_uuid)
+                
             has_taxon_profile = False
             taxon_profile = self.get_taxon_profile()
             if taxon_profile:
@@ -358,7 +361,7 @@ class TaxonSerializer:
     
     def serialize_as_registry_taxon(self, languages, name_type, name, is_preferred_name, accepted_name_uuid=None):
         
-        if self.lazy_taxon.name_uuid in self.taxa_builder.cache['registry']:
+        if str(self.lazy_taxon.name_uuid) in self.taxa_builder.cache['registry']:
             registry_taxon_json = self.taxa_builder.cache['registry']
             
         else:
@@ -376,7 +379,7 @@ class TaxonSerializer:
                 if preferred_vernacular_name:
                     registry_taxon_json['vernacularNames'][language_code] = preferred_vernacular_name
                     
-            self.taxa_builder.cache['registry'][self.lazy_taxon.name_uuid] = registry_taxon_json
+            self.taxa_builder.cache['registry'][str(self.lazy_taxon.name_uuid)] = registry_taxon_json
             
         registry_taxon_json_copy = copy.deepcopy(registry_taxon_json)
         

app_kit/features/backbonetaxonomy/templates/backbonetaxonomy/update_taxon_references.html

@@ -40,6 +40,13 @@
                 </div>
             {% endfor %}
         <div>
+        {% if updated %}
+            <div class="col-12">
+                <div class="alert alert-success">
+                    {% trans 'Taxon references have been updated successfully.' %}
+                </div>
+            </div>
+        {% endif %}
         <div class="col-12">
             <form id="update-taxa-form" method="POST" action="{% url 'update_taxon_references' meta_app.id %}">
                 {% csrf_token %}

app_kit/management/commands/export_all_nature_guides.py

@@ -4,9 +4,14 @@ from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django_tenants.utils import schema_context  # Assuming django-tenants for multi-tenancy
+from django.core import serializers
+
+from app_kit.features.nature_guides.models import (NatureGuide, MetaNode, NatureGuidesTaxonTree, NatureGuideCrosslinks, MatrixFilterSpace,
+                                                   NatureGuidesTaxonSynonym, NatureGuidesTaxonLocale, MatrixFilter, NodeFilterSpace,
+                                                   MatrixFilterRestriction)
+
+from app_kit.models import ContentImage, ImageStore
 
-from app_kit.features.nature_guides.models import NatureGuide, MetaNode, NatureGuidesTaxonTree, MatrixFilterSpace
-from app_kit.models import ContentImage
 
 class Command(BaseCommand):
     help = 'Export all Nature Guides as ZIP files for a specific tenant schema'
@@ -39,7 +44,41 @@ class Command(BaseCommand):
             )
             
             # get all full filepaths of those images
-            image_filepaths = [ci.file.path for ci in content_images if ci.file]
-
+            image_filepaths = []
+            for ci in content_images:
+                if ci.image_store and ci.image_store.source_image:
+                    image_filepaths.append(ci.image_store.source_image.path)
+            
+            # zip all those images into a single zip file
+            zip_filename = os.path.join(export_path, f'nature_guides_images_{schema_name}.zip')
+            with zipfile.ZipFile(zip_filename, 'w') as zipf:
+                for filepath in image_filepaths:
+                    arcname = os.path.relpath(filepath, settings.MEDIA_ROOT)
+                    zipf.write(filepath, arcname)
+            
+            # Collect all objects to export
+            all_objects = []
+            nature_guide_models = [NatureGuide, MetaNode, NatureGuidesTaxonTree, NatureGuideCrosslinks, MatrixFilterSpace,
+                                   NatureGuidesTaxonSynonym, NatureGuidesTaxonLocale, MatrixFilter, NodeFilterSpace,
+                                   MatrixFilterRestriction]
+            for model in nature_guide_models:
+                all_objects.extend(model.objects.all())
+            all_objects.extend(content_images)  # The filtered ContentImage instances
+            
+            # Collect related ImageStore instances
+            image_stores = [ci.image_store for ci in content_images if ci.image_store]
+            all_objects.extend(image_stores)
+            
+            # Serialize to JSON
+            data_filename = os.path.join(export_path, 'nature_guides_data.json')
+            with open(data_filename, 'w') as f:
+                serializers.serialize('json', all_objects, stream=f)
+            
+            # Add the data file to the ZIP
+            with zipfile.ZipFile(zip_filename, 'a') as zipf:
+                zipf.write(data_filename, 'nature_guides_data.json')
+            
+            # Optionally, remove the temporary data file after adding to ZIP
+            os.remove(data_filename)
             
             self.stdout.write(f'All Nature Guides exported to: {export_path}')

app_kit/management/commands/import_all_nature_guides.py

@@ -0,0 +1,64 @@
+import os
+import zipfile
+import tempfile
+from django.core.management.base import BaseCommand, CommandError
+from django.conf import settings
+from django_tenants.utils import schema_context
+from django.core.management import call_command
+
+
+class Command(BaseCommand):
+    help = 'Import all Nature Guides from a ZIP file for a specific tenant schema'
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            'schema_name',
+            type=str,
+            help='The tenant schema name to import Nature Guides into (required).',
+        )
+        parser.add_argument(
+            '--zip-path',
+            type=str,
+            help='Path to the ZIP file to import (optional, defaults to the export path).',
+        )
+
+    def handle(self, *args, **options):
+        schema_name = options['schema_name']
+        zip_path = options.get('zip_path')
+        
+        if not zip_path:
+            export_path = os.path.join(settings.MEDIA_ROOT, 'nature_guides_exports', schema_name)
+            zip_path = os.path.join(export_path, f'nature_guides_images_{schema_name}.zip')
+        
+        if not os.path.exists(zip_path):
+            raise CommandError(f'ZIP file not found: {zip_path}')
+        
+        # Use schema_context to switch to the tenant's schema
+        with schema_context(schema_name):
+            # Create a temporary directory to extract files
+            with tempfile.TemporaryDirectory() as temp_dir:
+                # Extract the ZIP file
+                with zipfile.ZipFile(zip_path, 'r') as zipf:
+                    zipf.extractall(temp_dir)
+                
+                # Find the data JSON file
+                data_filename = os.path.join(temp_dir, 'nature_guides_data.json')
+                if not os.path.exists(data_filename):
+                    raise CommandError('nature_guides_data.json not found in ZIP')
+                
+                # Load the data using loaddata
+                call_command('loaddata', data_filename, verbosity=1)
+                
+                # Extract images to MEDIA_ROOT
+                for root, dirs, files in os.walk(temp_dir):
+                    for file in files:
+                        if file.endswith(('.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff')):  # Add more extensions if needed
+                            src_path = os.path.join(root, file)
+                            # Calculate the relative path from temp_dir
+                            rel_path = os.path.relpath(src_path, temp_dir)
+                            dest_path = os.path.join(settings.MEDIA_ROOT, rel_path)
+                            os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+                            # Move or copy the file
+                            os.rename(src_path, dest_path)  # Use shutil.move if needed
+            
+            self.stdout.write(f'All Nature Guides imported successfully for schema: {schema_name}')

app_kit/taxonomy/sources/TaxonSourceManager.py

@@ -22,6 +22,8 @@ from django.db import transaction
 # Python 3
 import logging, html
 
+DEBUG = False
+
 
 '''
     base
@@ -208,7 +210,7 @@ class SourceTreeTaxon(SourceTaxon):
     def set_nuid_from_db(self):
 
         if self.nuid is None:
-            print('setting nuid from db')
+            #print('setting nuid from db')
             db_entry = self.TreeModel.objects.filter(source_id=self.source_id).first()
             if db_entry:
                 self.nuid = db_entry.taxon_nuid
@@ -764,7 +766,9 @@ class TaxonSourceManager:
             last_child = self._climb_down(start_taxon)
 
             message = 'last_child: {0}, nuid: {1}'.format(last_child.latname, last_child.get_nuid())
-            print(message)
+            
+            if DEBUG == True:
+                print(message)
             # self.logger.info(message)
 
             # search siblings of this childless taxon, or parent siblings if no siblings available
@@ -782,8 +786,10 @@ class TaxonSourceManager:
             if next_parent:
                 start_taxon = next_parent
                 message = 'starting nuid (next_parent): {0}'.format(start_taxon.get_nuid())
-                print(message)
-                # self.logger.info(message)
+                
+                if DEBUG == True:
+                    print(message)
+                    # self.logger.info(message)
                 
             else:
                 continue_climbing = False
@@ -1063,8 +1069,10 @@ class TaxonSourceManager:
     def _climb_down(self, parent_taxon):
 
         message = 'climb down: {0}'.format(parent_taxon.latname)
-        print(message)
-        # self.logger.info(message)
+        
+        if DEBUG == True:
+            print(message)
+            # self.logger.info(message)
 
         # if no nuid is found, it might be a duplicate
         is_duplicate = self._check_taxon_duplicate(parent_taxon)