openedx-learning 0.6.2__py2.py3-none-any.whl → 0.8.0__py2.py3-none-any.whl

openedx_learning/__init__.py

@@ -1,4 +1,4 @@
 """
 Open edX Learning ("Learning Core").
 """
-__version__ = "0.6.2"
+__version__ = "0.8.0"

{openedx_learning-0.6.2.dist-info → openedx_learning-0.8.0.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.6.2
+Version: 0.8.0
 Summary: An experiment.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
 Author-email: dave@tcril.org
 License: AGPL 3.0
 Keywords: Python edx
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 3.2
@@ -16,13 +15,15 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or l
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Requires-Dist: celery
-Requires-Dist: attrs
-Requires-Dist: rules (<4.0)
-Requires-Dist: Django (<5.0)
-Requires-Dist: djangorestframework (<4.0)
+License-File: LICENSE.txt
+Requires-Dist: rules <4.0
+Requires-Dist: Django <5.0
 Requires-Dist: edx-drf-extensions
+Requires-Dist: attrs
+Requires-Dist: djangorestframework <4.0
+Requires-Dist: celery
 
 openedx-learning
 =============================
@@ -222,5 +223,3 @@ Added
 _____
 
 * First release on PyPI.
-
-

{openedx_learning-0.6.2.dist-info → openedx_learning-0.8.0.dist-info}/RECORD

@@ -1,4 +1,5 @@
-openedx_learning/__init__.py,sha256=Uxw5oLTw8J4jhitEbqxxCFFiwAF-KHiHtkJlIwZBBew,67
+openedx_learning/__init__.py,sha256=_N21txzaFcs_eHSkmGfXQjBRuBlyFhJELEUysAn134Q,67
+openedx_learning/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/contrib/media_server/__init__.py,sha256=iYijWFCl5RNR9omSu22kMl49EfponoqXBqXr0HMp4QI,56
 openedx_learning/contrib/media_server/apps.py,sha256=FPT0rsUFtPyhFpWKjSI1e_s58wU0IbDyaAW_66V6sY4,816
@@ -44,10 +45,11 @@ openedx_learning/rest_api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 openedx_learning/rest_api/v1/components.py,sha256=OYNWqarNtVmiKunIMlZWNGVCeZ5ATco2ZTuxPR-BS9I,757
 openedx_learning/rest_api/v1/urls.py,sha256=g0nYjq6qWjd08TUzsb-tQ_ZFRmQsxCIQvQRNa6oCAns,256
 openedx_tagging/__init__.py,sha256=V9N8M7f9LYlAbA_DdPUsHzTnWjYRXKGa5qHw9P1JnNI,30
+openedx_tagging/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_tagging/core/tagging/admin.py,sha256=5mSTxlftMq5MVGzdE8xl3AcxgtfpnrKpXPNdvw7hAno,1075
-openedx_tagging/core/tagging/api.py,sha256=jXmu2WPFDEiLKpz0OqVR8yo7NyKTo3omlRkytwa__L8,15758
+openedx_tagging/core/tagging/admin.py,sha256=Ngc2l9Mf6gkzmqu7aOwq-d0mgV8szx0GzSeuWFX7Kyg,1080
+openedx_tagging/core/tagging/api.py,sha256=JlS8KQiTBd0rEQqEqE5hf7QnCnR9KZRFw-ShcJPhJ4U,18749
 openedx_tagging/core/tagging/apps.py,sha256=-gp0VYqX4XQzwjjd-G68Ev2Op0INLh9Byz5UOqF5_7k,345
 openedx_tagging/core/tagging/data.py,sha256=421EvmDzdM7H523dBVQk4J0W_UwTT4U5syqPRXUYK4g,1353
 openedx_tagging/core/tagging/rules.py,sha256=UqIPPbOVA6FFF6uqLk0s5ORUczSYQt-a-S6Q_dB-RiE,6286
@@ -78,24 +80,25 @@ openedx_tagging/core/tagging/migrations/0012_language_taxonomy.py,sha256=asxUvOl
 openedx_tagging/core/tagging/migrations/0013_tag_parent_blank.py,sha256=N0Bk_p_l38t6syyJxNKHB95D5MkZqUgr90ISRbBOCKA,619
 openedx_tagging/core/tagging/migrations/0014_minor_fixes.py,sha256=46_F-el1UylSRnIRbY2DHeZpA9GJLrmGpEuF-urAtt4,1406
 openedx_tagging/core/tagging/migrations/0015_taxonomy_export_id.py,sha256=jhS-T8o2mwu61E7hPbjjE_6MPLKRPQFAVu7pJHZNRz4,1454
+openedx_tagging/core/tagging/migrations/0016_object_tag_export_id.py,sha256=X62sThGNv_0_wCBhWPcYRcs90EJwz9km9Nszr9yMVkM,2371
 openedx_tagging/core/tagging/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/models/__init__.py,sha256=yYdOnthuc7EUdfEULtZgqRwn5Y4bbYQmJCjVZqR5GTM,236
-openedx_tagging/core/tagging/models/base.py,sha256=8RrvrmX5tTHbMNibzzHZbEu97XP7HHVPEVNlvPT2tZU,38623
+openedx_tagging/core/tagging/models/base.py,sha256=1WAPxssL8thAg8LHh1GbwSo98H81-nVdTVQt1nC1ZdU,39335
 openedx_tagging/core/tagging/models/import_export.py,sha256=cXsTk44CO6RZvmiMI5ERsyjuM-wYnJoORwCsGEj6OEc,4125
 openedx_tagging/core/tagging/models/system_defined.py,sha256=_6LfvUZGEltvQMtm2OXy6TOLh3C8GnVTqtZDSAZW6K4,9062
-openedx_tagging/core/tagging/models/utils.py,sha256=JD3ypABgEdx5lQBttFm0ByfgHJPuOQiJ8HYvUgAMA8g,1417
+openedx_tagging/core/tagging/models/utils.py,sha256=-A3Dj24twmTf65UB7G4WLvb_9qEvduEPIwahZ-FJDlg,1926
 openedx_tagging/core/tagging/rest_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/rest_api/paginators.py,sha256=BUIAg3taihHx7uAjpTZAGK1xSZzZY9G0aib4OKv5c0k,2651
 openedx_tagging/core/tagging/rest_api/urls.py,sha256=egXaRQv1EAgF04ThgVZBQuvLK1LimuyUKKBD2Hbqb10,148
 openedx_tagging/core/tagging/rest_api/utils.py,sha256=XZXixZ44vpNlxiyFplW8Lktyh_m1EfR3Y-tnyvA7acc,3620
 openedx_tagging/core/tagging/rest_api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/rest_api/v1/permissions.py,sha256=7HPE_NuKku_ISnkeE_HsFNXVYt0IbVkJN6M4wqwHGHU,2443
-openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=NBRz7FkcNVf_rbvaf859TLDR1FqbCDuBtczgbt1DbGU,13294
+openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=XZ0iNRvVTKvO5rUGTOqPd2g1z0DPJjCtd4QOnRaQYCs,13386
 openedx_tagging/core/tagging/rest_api/v1/urls.py,sha256=dNUKCtUCx_YzrwlbEbpDfjGVQbb2QdJ1VuJCkladj6E,752
-openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=7_B9DAoMz7gFQDPCsiX_aThc-YG9S4AjLipObyYNDk0,34464
+openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=raxgG0iiKSfU4M3_9GIFiT1zWbyuR1Y_WFjcRzryK_U,34778
 openedx_tagging/core/tagging/rest_api/v1/views_import.py,sha256=kbHUPe5A6WaaJ3J1lFIcYCt876ecLNQfd19m7YYub6c,1470
-openedx_learning-0.6.2.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
-openedx_learning-0.6.2.dist-info/METADATA,sha256=CE9dS9_ExpRV7Ha8sgyeJxctbLzEsMV7HEdDdZ8GGIw,8758
-openedx_learning-0.6.2.dist-info/WHEEL,sha256=Z-nyYpwrcSqxfdux5Mbn_DQ525iP7J2DG3JgGvOYyTQ,110
-openedx_learning-0.6.2.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
-openedx_learning-0.6.2.dist-info/RECORD,,
+openedx_learning-0.8.0.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
+openedx_learning-0.8.0.dist-info/METADATA,sha256=fra-pVZqXDivTwt_43cafF90HTDt5i0Shge6AtP1TV8,8809
+openedx_learning-0.8.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+openedx_learning-0.8.0.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
+openedx_learning-0.8.0.dist-info/RECORD,,

{openedx_learning-0.6.2.dist-info → openedx_learning-0.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.36.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

openedx_tagging/core/tagging/admin.py

@@ -34,7 +34,7 @@ class ObjectTagAdmin(admin.ModelAdmin):
     """
     fields = ["object_id", "taxonomy", "tag", "_value"]
     autocomplete_fields = ["tag"]
-    list_display = ["object_id", "name", "value"]
+    list_display = ["object_id", "export_id", "value"]
     readonly_fields = ["object_id"]
 
     def has_add_permission(self, request):

openedx_tagging/core/tagging/api.py

@@ -67,6 +67,14 @@ def get_taxonomy(taxonomy_id: int) -> Taxonomy | None:
     return taxonomy.cast() if taxonomy else None
 
 
+def get_taxonomy_by_export_id(taxonomy_export_id: str) -> Taxonomy | None:
+    """
+    Returns a Taxonomy cast to the appropriate subclass which has the given export ID.
+    """
+    taxonomy = Taxonomy.objects.filter(export_id=taxonomy_export_id).first()
+    return taxonomy.cast() if taxonomy else None
+
+
 def get_taxonomies(enabled=True) -> QuerySet[Taxonomy]:
     """
     Returns a queryset containing the enabled taxonomies, sorted by name.
@@ -197,7 +205,7 @@ def get_object_tags(
             Value("\t"),
             output_field=models.CharField(),
         )))
-        .annotate(taxonomy_name=Coalesce(F("taxonomy__name"), F("_name")))
+        .annotate(taxonomy_name=Coalesce(F("taxonomy__name"), F("_export_id")))
         # Sort first by taxonomy name, then by tag value in tree order:
         .order_by("taxonomy_name", "sort_key")
     )
@@ -266,12 +274,58 @@ def delete_object_tags(object_id: str):
     tags.delete()
 
 
-# TODO: a function called "tag_object" should take "object_id" as its first parameter, not taxonomy
-def tag_object(
-    taxonomy: Taxonomy,
+def _check_new_tag_count(
+    new_tag_count: int,
+    taxonomy: Taxonomy | None,
+    object_id: str,
+    taxonomy_export_id: str | None = None,
+) -> None:
+    """
+    Checks if the new count of tags for the object is equal or less than 100
+    """
+    # Exclude to avoid counting the tags that are going to be updated
+    if taxonomy:
+        current_count = ObjectTag.objects.filter(object_id=object_id).exclude(taxonomy_id=taxonomy.id).count()
+    else:
+        current_count = ObjectTag.objects.filter(object_id=object_id).exclude(_export_id=taxonomy_export_id).count()
+
+    if current_count + new_tag_count > 100:
+        raise ValueError(
+            _("Cannot add more than 100 tags to ({object_id}).").format(object_id=object_id)
+        )
+
+
+def _get_current_tags(
+    taxonomy: Taxonomy | None,
     tags: list[str],
     object_id: str,
     object_tag_class: type[ObjectTag] = ObjectTag,
+    taxonomy_export_id: str | None = None,
+) -> list[ObjectTag]:
+    """
+    Returns the current object tags of the related object_id with taxonomy
+    """
+    ObjectTagClass = object_tag_class
+    if taxonomy:
+        if not taxonomy.allow_multiple and len(tags) > 1:
+            raise ValueError(_("Taxonomy ({name}) only allows one tag per object.").format(name=taxonomy.name))
+        current_tags = list(
+           ObjectTagClass.objects.filter(taxonomy=taxonomy, object_id=object_id)
+        )
+    else:
+        current_tags = list(
+            ObjectTagClass.objects.filter(_export_id=taxonomy_export_id, object_id=object_id)
+        )
+    return current_tags
+
+
+def tag_object(
+    object_id: str,
+    taxonomy: Taxonomy | None,
+    tags: list[str],
+    object_tag_class: type[ObjectTag] = ObjectTag,
+    create_invalid: bool = False,
+    taxonomy_export_id: str | None = None,
 ) -> None:
     """
     Replaces the existing ObjectTag entries for the given taxonomy + object_id
@@ -285,37 +339,34 @@ def tag_object(
     Raised Tag.DoesNotExist if the proposed tags are invalid for this taxonomy.
     Preserves existing (valid) tags, adds new (valid) tags, and removes omitted
     (or invalid) tags.
-    """
-
-    def _check_new_tag_count(new_tag_count: int) -> None:
-        """
-        Checks if the new count of tags for the object is equal or less than 100
-        """
-        # Exclude self.id to avoid counting the tags that are going to be updated
-        current_count = ObjectTag.objects.filter(object_id=object_id).exclude(taxonomy_id=taxonomy.id).count()
-
-        if current_count + new_tag_count > 100:
-            raise ValueError(
-                _("Cannot add more than 100 tags to ({object_id}).").format(object_id=object_id)
-            )
+    create_invalid: You can create invalid tags and avoid the previous behavior using.
 
+    taxonomy_export_id: You can create object tags without taxonomy using this param
+    and `taxonomy` as None. You need to use the taxonomy.export_id, so you can resync
+    this object tag if the taxonomy is created in the future.
+    """
     if not isinstance(tags, list):
         raise ValueError(_("Tags must be a list, not {type}.").format(type=type(tags).__name__))
 
     ObjectTagClass = object_tag_class
-    taxonomy = taxonomy.cast()  # Make sure we're using the right subclass. This is a no-op if we are already.
     tags = list(dict.fromkeys(tags))  # Remove duplicates preserving order
 
-    _check_new_tag_count(len(tags))
-
-    if not taxonomy.allow_multiple and len(tags) > 1:
-        raise ValueError(_("Taxonomy ({name}) only allows one tag per object.").format(name=taxonomy.name))
-
-    current_tags = list(
-        ObjectTagClass.objects.filter(taxonomy=taxonomy, object_id=object_id)
+    if taxonomy:
+        taxonomy = taxonomy.cast()  # Make sure we're using the right subclass. This is a no-op if we are already.
+    elif not taxonomy_export_id:
+        raise ValueError("`taxonomy_export_id` can't be None if `taxonomy` is None")
+
+    _check_new_tag_count(len(tags), taxonomy, object_id, taxonomy_export_id)
+    current_tags = _get_current_tags(
+        taxonomy,
+        tags,
+        object_id,
+        object_tag_class,
+        taxonomy_export_id
     )
+
     updated_tags = []
-    if taxonomy.allow_free_text:
+    if taxonomy and taxonomy.allow_free_text:
         for tag_value in tags:
             object_tag_index = next((i for (i, t) in enumerate(current_tags) if t.value == tag_value), -1)
             if object_tag_index >= 0:
@@ -327,19 +378,46 @@ def tag_object(
     else:
         # Handle closed taxonomies:
         for tag_value in tags:
-            tag = taxonomy.tag_for_value(tag_value)  # Will raise Tag.DoesNotExist if the value is invalid.
-            object_tag_index = next((i for (i, t) in enumerate(current_tags) if t.tag_id == tag.id), -1)
-            if object_tag_index >= 0:
-                # This tag is already applied.
-                object_tag = current_tags.pop(object_tag_index)
-                if object_tag._value != tag.value:  # pylint: disable=protected-access
-                    # The ObjectTag's cached '_value' is out of sync with the Tag, so update it:
-                    object_tag._value = tag.value  # pylint: disable=protected-access
+            tag = None
+            # When export, sometimes, the value has a space at the beginning and end.
+            tag_value = tag_value.strip()
+            if taxonomy:
+                try:
+                    tag = taxonomy.tag_for_value(tag_value)  # Will raise Tag.DoesNotExist if the value is invalid.
+                except Tag.DoesNotExist as e:
+                    if not create_invalid:
+                        raise e
+
+            if tag:
+                # Tag exists in the taxonomy
+                object_tag_index = next((i for (i, t) in enumerate(current_tags) if t.tag_id == tag.id), -1)
+                if object_tag_index >= 0:
+                    # This tag is already applied.
+                    object_tag = current_tags.pop(object_tag_index)
+                    if object_tag._value != tag.value:  # pylint: disable=protected-access
+                        # The ObjectTag's cached '_value' is out of sync with the Tag, so update it:
+                        object_tag._value = tag.value  # pylint: disable=protected-access
+                        updated_tags.append(object_tag)
+                else:
+                    # We are newly applying this tag:
+                    object_tag = ObjectTagClass(taxonomy=taxonomy, object_id=object_id, tag=tag)
                     updated_tags.append(object_tag)
-            else:
-                # We are newly applying this tag:
-                object_tag = ObjectTagClass(taxonomy=taxonomy, object_id=object_id, tag=tag)
+            elif taxonomy:
+                # Tag doesn't exist in the taxonomy and `create_invalid` is True
+                object_tag = ObjectTagClass(taxonomy=taxonomy, object_id=object_id, _value=tag_value)
                 updated_tags.append(object_tag)
+            else:
+                # Taxonomy is None (also tag doesn't exist)
+                if taxonomy_export_id:
+                    # This will always be true, since it is verified at the beginning of the function.
+                    # This condition is placed by the type checks.
+                    object_tag = ObjectTagClass(
+                        taxonomy=None,
+                        object_id=object_id,
+                        _value=tag_value,
+                        _export_id=taxonomy_export_id
+                    )
+                    updated_tags.append(object_tag)
 
     # Save all updated tags at once to avoid partial updates
     with transaction.atomic():

openedx_tagging/core/tagging/migrations/0016_object_tag_export_id.py

@@ -0,0 +1,62 @@
+# Generated by Django 3.2.22 on 2024-03-22 19:47
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import openedx_learning.lib.fields
+
+
+def migrate_export_id(apps, schema_editor):
+    ObjectTag = apps.get_model("oel_tagging", "ObjectTag")
+    for object_tag in ObjectTag.objects.all():
+        if object_tag.taxonomy:
+            object_tag.export_id = object_tag.taxonomy.export_id
+            object_tag.save(update_fields=["_export_id"])
+
+
+def reverse_export_id(apps, schema_editor):
+    pass
+
+
+def migrate_language_export_id(apps, schema_editor):
+    Taxonomy = apps.get_model("oel_tagging", "Taxonomy")
+    language_taxonomy = Taxonomy.objects.get(id=-1)
+    language_taxonomy.export_id = 'languages-v1'
+    language_taxonomy.save(update_fields=["export_id"])
+
+
+def reverse_language_export_id(apps, schema_editor):
+    """
+    Return to old export_id
+    """
+    Taxonomy = apps.get_model("oel_tagging", "Taxonomy")
+    language_taxonomy = Taxonomy.objects.get(id=-1)
+    language_taxonomy.export_id = '-1-languages'
+    language_taxonomy.save(update_fields=["export_id"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oel_tagging', '0015_taxonomy_export_id'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='objecttag',
+            old_name='_name',
+            new_name='_export_id',
+        ),
+        migrations.RunPython(migrate_export_id, reverse_export_id),
+        migrations.AlterField(
+            model_name='objecttag',
+            name='taxonomy',
+            field=models.ForeignKey(blank=True, default=None, help_text="Taxonomy that this object tag belongs to. Used for validating the tag and provides the tag's 'name' if set.", null=True, on_delete=django.db.models.deletion.SET_NULL, to='oel_tagging.taxonomy'),
+        ),
+        migrations.AlterField(
+            model_name='objecttag',
+            name='_export_id',
+            field=openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_unicode_ci', 'sqlite': 'NOCASE'}, help_text='User-facing label used for this tag, stored in case taxonomy is (or becomes) null. If the taxonomy field is set, then taxonomy.export_id takes precedence over this field.', max_length=255),
+        ),
+        migrations.RunPython(migrate_language_export_id, reverse_language_export_id),
+    ]

openedx_tagging/core/tagging/models/base.py

@@ -19,7 +19,7 @@ from typing_extensions import Self  # Until we upgrade to python 3.11
 from openedx_learning.lib.fields import MultiCollationTextField, case_insensitive_char_field, case_sensitive_char_field
 
 from ..data import TagDataQuerySet
-from .utils import ConcatNull
+from .utils import RESERVED_TAG_CHARS, ConcatNull
 
 log = logging.getLogger(__name__)
 
@@ -191,9 +191,11 @@ class Tag(models.Model):
         self.value = self.value.strip()
         if self.external_id:
             self.external_id = self.external_id.strip()
-        # Don't allow \t (tab) character at all, as we use it for lineage in database queries
-        if "\t" in self.value:
-            raise ValidationError("Tags in a taxonomy cannot contain a TAB character.")
+
+        for reserved_char in RESERVED_TAG_CHARS:
+            if reserved_char in self.value:
+                raise ValidationError(f"Tags cannot contain a '{reserved_char}' character.")
+
         if self.external_id and "\t" in self.external_id:
             raise ValidationError("Tag external ID cannot contain a TAB character.")
 
@@ -775,6 +777,7 @@ class ObjectTag(models.Model):
     taxonomy = models.ForeignKey(
         Taxonomy,
         null=True,
+        blank=True,
         default=None,
         on_delete=models.SET_NULL,
         help_text=_(
@@ -792,11 +795,11 @@ class ObjectTag(models.Model):
             "Tag associated with this object tag. Provides the tag's 'value' if set."
         ),
     )
-    _name = case_insensitive_char_field(
+    _export_id = case_insensitive_char_field(
         max_length=255,
         help_text=_(
             "User-facing label used for this tag, stored in case taxonomy is (or becomes) null."
-            " If the taxonomy field is set, then taxonomy.name takes precedence over this field."
+            " If the taxonomy field is set, then taxonomy.export_id takes precedence over this field."
         ),
     )
     _value = case_insensitive_char_field(
@@ -821,9 +824,9 @@ class ObjectTag(models.Model):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not self.pk:  # This is a new instance:
-            # Set _name and _value automatically on creation, if they weren't set:
-            if not self._name and self.taxonomy:
-                self._name = self.taxonomy.name
+            # Set _export_id and _value automatically on creation, if they weren't set:
+            if not self._export_id and self.taxonomy:
+                self._export_id = self.taxonomy.export_id
             if not self._value and self.tag:
                 self._value = self.tag.value
 
@@ -837,24 +840,28 @@ class ObjectTag(models.Model):
         """
         User-facing string representation of an ObjectTag.
         """
-        return f"<{self.__class__.__name__}> {self.object_id}: {self.name}={self.value}"
+        if self.taxonomy:
+            name = self.taxonomy.name
+        else:
+            name = self.export_id
+        return f"<{self.__class__.__name__}> {self.object_id}: {name}={self.value}"
 
     @property
-    def name(self) -> str:
+    def export_id(self) -> str:
         """
         Returns this tag's name/label.
 
         If taxonomy is set, then returns its name.
-        Otherwise, returns the cached _name field.
+        Otherwise, returns the cached _export_id field.
         """
-        return self.taxonomy.name if self.taxonomy else self._name
+        return self.taxonomy.export_id if self.taxonomy else self._export_id
 
-    @name.setter
-    def name(self, name: str):
+    @export_id.setter
+    def export_id(self, export_id: str):
         """
-        Stores to the _name field.
+        Stores to the _export_id field.
         """
-        self._name = name
+        self._export_id = export_id
 
     @property
     def value(self) -> str:
@@ -899,8 +906,11 @@ class ObjectTag(models.Model):
             # was deleted, but we still preserve this _value here in case the Taxonomy or Tag get re-created in future.
             if self._value == "":
                 raise ValidationError("Invalid _value - empty string")
-        if self.taxonomy and self.taxonomy.name != self._name:
-            raise ValidationError("ObjectTag's _name is out of sync with Taxonomy.name")
+            for reserved_char in RESERVED_TAG_CHARS:
+                if reserved_char in self.value:
+                    raise ValidationError(f"Invalid _value - '{reserved_char}' is not allowed")
+        if self.taxonomy and self.taxonomy.export_id != self._export_id:
+            raise ValidationError("ObjectTag's _export_id is out of sync with Taxonomy.export_id")
         if "," in self.object_id or "*" in self.object_id:
             # Some APIs may use these characters to allow wildcard matches or multiple matches in the future.
             raise ValidationError("Object ID contains invalid characters")
@@ -930,11 +940,18 @@ class ObjectTag(models.Model):
         # We used to have code here that would try to find a new taxonomy if the current taxonomy has been deleted.
         # But for now that's removed, as it risks things like linking a tag to the wrong org's taxonomy.
 
-        # Sync the stored _name with the taxonomy.name
-        if self.taxonomy and self._name != self.taxonomy.name:
-            self.name = self.taxonomy.name
+        # Sync the stored _export_id with the taxonomy.name
+        if self.taxonomy and self._export_id != self.taxonomy.export_id:
+            self.export_id = self.taxonomy.export_id
             changed = True
 
+        # Sync taxonomy with matching _export_id
+        if not self.taxonomy:
+            taxonomy = Taxonomy.objects.filter(export_id=self.export_id).first()
+            if taxonomy:
+                self.taxonomy = taxonomy
+                changed = True
+
         # Closed taxonomies require a tag matching _value
         if self.taxonomy and not self.taxonomy.allow_free_text and not self.tag_id:
             tag = self.taxonomy.tag_set.filter(value=self.value).first()
@@ -965,5 +982,5 @@ class ObjectTag(models.Model):
         self.taxonomy = object_tag.taxonomy
         self.object_id = object_tag.object_id
         self._value = object_tag._value  # pylint: disable=protected-access
-        self._name = object_tag._name  # pylint: disable=protected-access
+        self._export_id = object_tag._export_id  # pylint: disable=protected-access
         return self

openedx_tagging/core/tagging/models/utils.py

@@ -4,6 +4,16 @@ Utilities for tagging and taxonomy models
 from django.db.models import Aggregate, CharField
 from django.db.models.expressions import Func
 
+RESERVED_TAG_CHARS = [
+    '\t',  # Used in the database to separate tag levels in the "lineage" field
+           # e.g. lineage="Earth\tNorth America\tMexico\tMexico City"
+    ' > ',  # Used in the search index and Instantsearch frontend to separate tag levels
+            # e.g. tags_level3="Earth > North America > Mexico > Mexico City"
+    ';',   # Used in CSV exports to separate multiple tags from the same taxonomy
+           # e.g. languages-v1: en;es;fr
+]
+TAGS_CSV_SEPARATOR = RESERVED_TAG_CHARS[2]
+
 
 class ConcatNull(Func):  # pylint: disable=abstract-method
     """

openedx_tagging/core/tagging/rest_api/v1/serializers.py

@@ -180,10 +180,11 @@ class ObjectTagsByTaxonomySerializer(UserPermissionsSerializerMixin, serializers
             tax_entry = next((t for t in taxonomies if t["taxonomy_id"] == obj_tag.taxonomy_id), None)
             if tax_entry is None:
                 tax_entry = {
-                    "name": obj_tag.name,
+                    "name": obj_tag.taxonomy.name if obj_tag.taxonomy else None,
                     "taxonomy_id": obj_tag.taxonomy_id,
                     "can_tag_object": self._can(can_tag_object_perm, obj_tag),
-                    "tags": []
+                    "tags": [],
+                    "export_id": obj_tag.export_id,
                 }
                 taxonomies.append(tax_entry)
             tax_entry["tags"].append(ObjectTagMinimalSerializer(obj_tag, context=self.context).data)

openedx_tagging/core/tagging/rest_api/v1/views.py

@@ -23,6 +23,7 @@ from ...api import (
     get_object_tags,
     get_taxonomies,
     get_taxonomy,
+    resync_object_tags,
     tag_object,
     update_tag_in_taxonomy,
 )
@@ -315,6 +316,8 @@ class TaxonomyView(ModelViewSet):
 
             if import_success:
                 serializer = self.get_serializer(taxonomy)
+                # We need to resync all object tags because, there may be tags that do not have a taxonomy.
+                resync_object_tags()
                 return Response(serializer.data, status=status.HTTP_201_CREATED)
             else:
                 taxonomy.delete()
@@ -340,6 +343,8 @@ class TaxonomyView(ModelViewSet):
 
             if import_success:
                 serializer = self.get_serializer(taxonomy)
+                # We need to resync all object tags because, there may be tags that do not have a taxonomy.
+                resync_object_tags()
                 return Response(serializer.data)
             else:
                 return Response(task.log, status=status.HTTP_400_BAD_REQUEST)
@@ -549,7 +554,7 @@ class ObjectTagView(
 
         tags = body.data.get("tags", [])
         try:
-            tag_object(taxonomy, tags, object_id)
+            tag_object(object_id, taxonomy, tags)
         except TagDoesNotExist as e:
             raise ValidationError from e
         except ValueError as e: