Linglings suggestions

Author: andrewelamb

synapseclient/__main__.py

@@ -1897,7 +1897,7 @@ def build_parser():
         "--fix-schema-name",
         action="store_true",
         default=False,
-        help="Fixes the schema name to meet Synapse requirements by replacing dashes and underscores with periods.",
+        help="Replaces dashes and underscores with periods in the schema name (e.g., 'my-schema_name' becomes 'my.schema.name')",
     )
     parser_register_json_schema.add_argument(
         "--schema-version",

synapseclient/extensions/curator/schema_management.py

@@ -6,6 +6,7 @@
 """
 
 import json
+import re
 from typing import TYPE_CHECKING, Optional
 
 from synapseclient.core.async_utils import wrap_async_to_sync
@@ -130,11 +131,13 @@ async def register_jsonschema_async(
     from synapseclient import Synapse
     from synapseclient.models.schema_organization import JSONSchema
 
-    if fix_schema_name:
-        schema_name = schema_name.replace("-", ".").replace("_", ".")
-
     syn = Synapse.get_client(synapse_client=synapse_client)
 
+    if fix_schema_name:
+        old_name = schema_name
+        schema_name = fix_name(schema_name)
+        syn.logger.info(f"Changed schema name from '{old_name}' to '{schema_name}' ")
+
     with open(schema_path, "r") as f:
         schema_body = json.load(f)
 
@@ -154,6 +157,24 @@ async def register_jsonschema_async(
     return json_schema
 
 
+def fix_name(name: str) -> str:
+    """
+    Fixes a schema name to meet Synapse requirements by:
+      - replacing dashes and underscores with periods.
+      - collapsing multiple consecutive periods into a single period.
+
+    Arguments:
+        name: The original schema name
+
+    Returns:
+        The fixed schema name
+
+    """
+    name = name.replace("-", ".").replace("_", ".")
+    name = re.sub(r"\.+", ".", name)
+    return name
+
+
 def bind_jsonschema(
     entity_id: str,
     json_schema_uri: str,

tests/unit/synapseclient/extensions/test_schema_management.py

@@ -4,6 +4,7 @@
 import pytest
 
 from synapseclient.extensions.curator import register_jsonschema_async
+from synapseclient.extensions.curator.schema_management import fix_name
 
 
 @pytest.fixture
@@ -94,3 +95,28 @@ async def test_register_jsonschema_async_fix_schema_name(
         )
 
         assert result.uri == "syn123.456"
+
+
+@pytest.mark.parametrize(
+    "name, expected_fixed_name",
+    [
+        ("name", "name"),
+        ("name.name", "name.name"),
+        ("name..name", "name.name"),
+        ("name-name", "name.name"),
+        ("name--name", "name.name"),
+        ("name_name", "name.name"),
+        ("name-_name", "name.name"),
+    ],
+    ids=[
+        "No special characters",
+        "One period",
+        "Multiple periods",
+        "One dash",
+        "Multiple dashes",
+        "Underscore",
+        "Mixed special characters",
+    ],
+)
+def test_fix_name(name, expected_fixed_name):
+    assert fix_name(name) == expected_fixed_name