localcosmos-app-kit 0.9.12__py3-none-any.whl → 0.9.13__py3-none-any.whl

app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py

@@ -566,6 +566,16 @@ class TaxonProfilesJSONBuilder(JSONBuilder):
                 taxon_json = self.app_release_builder.taxa_builder.serialize_taxon_extended(relationship.taxon)
                 related_taxon_json = self.app_release_builder.taxa_builder.serialize_taxon_extended(relationship.related_taxon)
                 
+                if relationship.relationship_type.taxon_role == None and relationship.relationship_type.related_taxon_role == None:
+                    # make 'taxon' the profile taxon
+                    if relationship.taxon.taxon_nuid == profile_taxon.taxon_nuid:
+                        pass
+                    else:
+                        # swap
+                        temp = taxon_json
+                        taxon_json = related_taxon_json
+                        related_taxon_json = temp
+                
                 relationship_json = {
                     'taxon': taxon_json,
                     'relatedTaxon': related_taxon_json,

app_kit/management/commands/export_all_nature_guides.py

@@ -44,17 +44,26 @@ class Command(BaseCommand):
             )
             
             # Get all full filepaths of those images
-            image_filepaths = []
+            image_filepaths = set()  # Use set to avoid duplicates
             for ci in content_images:
                 if ci.image_store and ci.image_store.source_image:
-                    image_filepaths.append(ci.image_store.source_image.path)
-            
+                    image_filepaths.add(ci.image_store.source_image.path)
+
+            # Also collect all ImageStore source_image paths
+            all_image_stores = ImageStore.objects.all()
+            for istore in all_image_stores:
+                if istore.source_image:
+                    image_filepaths.add(istore.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)
+                    if os.path.exists(filepath):  # Add check to skip missing files
+                        arcname = os.path.relpath(filepath, settings.MEDIA_ROOT)
+                        zipf.write(filepath, arcname)
+                    else:
+                        self.stdout.write(f'Warning: Image file not found: {filepath}')
             
             # Collect app labels and model names for dumpdata
             models_to_export = [

{localcosmos_app_kit-0.9.12.dist-info → localcosmos_app_kit-0.9.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcosmos_app_kit
-Version: 0.9.12
+Version: 0.9.13
 Summary: LocalCosmos App Kit. Web Portal to build Android and iOS apps
 Home-page: https://github.com/localcosmos/app-kit
 Author: Thomas Uher

{localcosmos_app_kit-0.9.12.dist-info → localcosmos_app_kit-0.9.13.dist-info}/RECORD

@@ -52,7 +52,7 @@ app_kit/appbuilder/JSONBuilders/GlossaryJSONBuilder.py,sha256=7pITMctTmEVRbyb7Dl
 app_kit/appbuilder/JSONBuilders/JSONBuilder.py,sha256=BssXm7ueXghCmHHmWsnQekQdbE4g0UIIQ59a6k0Bzts,6010
 app_kit/appbuilder/JSONBuilders/MapJSONBuilder.py,sha256=NgP5g_H0sfq5VRkoHdMzkQUGLgUofcwG1R2xe6vUS9U,2792
 app_kit/appbuilder/JSONBuilders/NatureGuideJSONBuilder.py,sha256=LZgyfc0e2xhTB9XES6fgm_vmL-O7VBBXsRdNDapgu5E,25498
-app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py,sha256=kXs-6mglmYwWHtnCch8UNCDaWifehZPYoVKUMjwCXSA,34198
+app_kit/appbuilder/JSONBuilders/TaxonProfilesJSONBuilder.py,sha256=XNtRAQ31UPSghcFPUR1-RQLdzDpDxmkITb_paYP4uxQ,34716
 app_kit/appbuilder/JSONBuilders/TemplateContentJSONBuilder.py,sha256=zWF7SNeRosbOi876boXp0tpIYXVs04fKtauK9Fr_DRs,7382
 app_kit/appbuilder/JSONBuilders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app_kit/appbuilder/JSONBuilders/generic_forms_JSON_specification,sha256=dFabBHtkfzJqB2zNSRR2OaIyroYr1nEw_qY6VFZF7dQ,6720
@@ -74,7 +74,7 @@ app_kit/appbuilder/JSONBuilders/__pycache__/NatureGuideJSONBuilder.cpython-311.p
 app_kit/appbuilder/JSONBuilders/__pycache__/NatureGuideJSONBuilder.cpython-313.pyc,sha256=jF5kdrd9eYsIuLJtophN4ptZB67MM1poI4Oao2aY8RU,25376
 app_kit/appbuilder/JSONBuilders/__pycache__/TaxonJSONBuilder.cpython-311.pyc,sha256=nEt3jd6Pf4lb0QnFpU7QPg9bsKa68z0Vh8C85t4CMO0,9663
 app_kit/appbuilder/JSONBuilders/__pycache__/TaxonProfilesJSONBuilder.cpython-311.pyc,sha256=bffiRE-WzCN3s0sz00rFuuu8c0qFL7kRq97XwtuRnoo,22862
-app_kit/appbuilder/JSONBuilders/__pycache__/TaxonProfilesJSONBuilder.cpython-313.pyc,sha256=QrMu-YAJw9EgdfyFJyVypKurUUQv3zB7fopKfr-0-2E,29239
+app_kit/appbuilder/JSONBuilders/__pycache__/TaxonProfilesJSONBuilder.cpython-313.pyc,sha256=--E2Ix4-WlvKe_BPIWLnqoNmEnkfWop0ZDn2FWJu1Ew,29536
 app_kit/appbuilder/JSONBuilders/__pycache__/TemplateContentJSONBuilder.cpython-311.pyc,sha256=7fGagTetGK129h057h6dPXMSwggBX03uHOm3_dr3ueE,5932
 app_kit/appbuilder/JSONBuilders/__pycache__/TemplateContentJSONBuilder.cpython-313.pyc,sha256=lXf1kZuOMRWsHmnP1aN7UJIPEfWF-PhiMyyZ9FfY1Tg,6501
 app_kit/appbuilder/JSONBuilders/__pycache__/__init__.cpython-311.pyc,sha256=MxwSyVkGIkNVrjjMZzXCHh9k7_ytM6tzgpNTaCtDNn4,211
@@ -480,7 +480,7 @@ app_kit/locale/en/LC_MESSAGES/django.po,sha256=jhD_BqtvCqoH-3NeWsLZy9v4DJ3vGYt1U
 app_kit/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app_kit/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app_kit/management/commands/create_app_kit.py,sha256=VeSBg2G0PbvZTTciIVJ_xkSzF_EfIYhvL0ZLmpouPHg,1204
-app_kit/management/commands/export_all_nature_guides.py,sha256=OuKM9oOu9Pm8sMMBHZ3hT595m5GpDUNwsr4BOu4wESg,4059
+app_kit/management/commands/export_all_nature_guides.py,sha256=Q2QVp4uBzjgLQYSWS4HA8ckhVMFfsp-kZBp6YOZSLrs,4552
 app_kit/management/commands/fix_nature_guide_trees.py,sha256=3WjcFIWly9rZtN0KFU4b4ZABQkAaPFE7UZciyN_QN7o,2973
 app_kit/management/commands/import_all_nature_guides.py,sha256=gsb5em1IxWFyZv9-sslbOfEgiESmDUGapTUpwQsUevw,4309
 app_kit/management/commands/migrate_apps_to_v1.py,sha256=DnXgtRs160UjpJiE75zElIxMT3CKfQfOoutX3d6aEwg,3276
@@ -1930,8 +1930,8 @@ app_kit/tests/__pycache__/test_models.cpython-313.pyc,sha256=Lmv3BfjLs5Fg-olJeMl
 app_kit/tests/__pycache__/test_utils.cpython-313.pyc,sha256=GX3REqZygi2eO_A2F2_KtYi7hg54X5QPtCTCGWuxGpM,14054
 app_kit/tests/__pycache__/test_views.cpython-311.pyc,sha256=NDJR40TcMm-bXXC-wV7OgH1sGR3N7psSWYiUirkkrjU,133242
 app_kit/tests/__pycache__/test_views.cpython-313.pyc,sha256=q851UqIZFCCTfQb1lF4SVxV1j_Vu1hJdOlpckmrGX28,125363
-localcosmos_app_kit-0.9.12.dist-info/licenses/LICENCE,sha256=VnxALPSxXoU59rlNeRdJtwS_nU79IFpVWsZZCQUM4Mw,1086
-localcosmos_app_kit-0.9.12.dist-info/METADATA,sha256=KzRiMoghIRYZUyPhDP4Ki6ZBmqb23K4QlditVjddrd8,1388
-localcosmos_app_kit-0.9.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-localcosmos_app_kit-0.9.12.dist-info/top_level.txt,sha256=F6H4pEBkCvUR_iwQHIy4K1iby-jzfWg3CTym5XJKeys,8
-localcosmos_app_kit-0.9.12.dist-info/RECORD,,
+localcosmos_app_kit-0.9.13.dist-info/licenses/LICENCE,sha256=VnxALPSxXoU59rlNeRdJtwS_nU79IFpVWsZZCQUM4Mw,1086
+localcosmos_app_kit-0.9.13.dist-info/METADATA,sha256=hg_K67TUbizhMbdhRqJhPuQRq4MCixNgrJLbCecQGXA,1388
+localcosmos_app_kit-0.9.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+localcosmos_app_kit-0.9.13.dist-info/top_level.txt,sha256=F6H4pEBkCvUR_iwQHIy4K1iby-jzfWg3CTym5XJKeys,8
+localcosmos_app_kit-0.9.13.dist-info/RECORD,,