From 40e33b31efcb7f8e5c45441830b3ada7192cce2e Mon Sep 17 00:00:00 2001
From: aandersn <alexander.a.anderson@ieee.org>
Date: Sat, 14 Jun 2025 15:38:36 -0700
Subject: [PATCH 1/2] add sterotypes, pint units

---
 .../cimantic-graphs/cimantic-graphs-init.xsl  | 112 ++++-
 .../cimantic-graphs/cimantic-graphs.xsl       | 401 ++++++++++++------
 2 files changed, 387 insertions(+), 126 deletions(-)

diff --git a/shipped-builders/cimantic-graphs/cimantic-graphs-init.xsl b/shipped-builders/cimantic-graphs/cimantic-graphs-init.xsl
index 0e6c9a2..8401dff 100644
--- a/shipped-builders/cimantic-graphs/cimantic-graphs-init.xsl
+++ b/shipped-builders/cimantic-graphs/cimantic-graphs-init.xsl
@@ -2,7 +2,7 @@
 <!--
 This builder is released under a BSD-3 license as part of the CIMantic Graphs library developed by PNNL.
 
-This software was created under a project sponsored by the U.S. Department of Energy’s Office of Electricity, 
+This software was created under a project sponsored by the U.S. Department of Energy's Office of Electricity, 
 an agency of the United States Government. Neither the United States Government nor the United States Department 
 of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated 
 in the development of these materials, makes any warranty, express or implied, or assumes any legal liability 
@@ -37,8 +37,8 @@ under Contract DE-AC05-76RL01830
             <!-- Header text with library imports -->
             <list begin="'''" indent="    " end="'''">
                 <item>Annotated CIMantic Graphs data profile init file for
-                <xsl:value-of select="$envelope" />
-            </item>
+                    <xsl:value-of select="$envelope" />
+                </item>
                 <item>Generated by CIMTool http://cimtool.org</item>
             </list>
             <!-- Import objects using profile name -->
@@ -49,13 +49,21 @@ under Contract DE-AC05-76RL01830
             <!-- List all CIM classes to be imported, in alphabetical order -->
             <xsl:for-each select="a:Root|a:ComplexType|a:EnumeratedType|a:CompoundType|a:SimpleType">
                 <xsl:sort select="name" data-type="text" order="ascending"/>
+                
+                <xsl:variable name="name">
+                    <xsl:call-template name="name">
+                        <xsl:with-param name="name" select="@name"/>
+                        <xsl:with-param name="type" select="@name"/>
+                    </xsl:call-template>
+                </xsl:variable>
+                
                 <list begin="" indent="    " end="">
-                    <xsl:value-of select="@name" />
+                    <xsl:value-of select="$name" />
                     <xsl:if test="position()!=last()">, </xsl:if>
                 </list>
             </xsl:for-each>
             <item>)</item>
-
+            
             <!-- List all CIM classes to be imported, in alphabetical order -->
             <item> __all__ = [ </item>
             <list begin="" indent="    " end="">
@@ -63,12 +71,102 @@ under Contract DE-AC05-76RL01830
             </list>
             <xsl:for-each select="a:Root|a:ComplexType|a:EnumeratedType|a:CompoundType|a:SimpleType">
                 <xsl:sort select="name" data-type="text" order="ascending"/>
+                
+                <xsl:variable name="name">
+                    <xsl:call-template name="name">
+                        <xsl:with-param name="name" select="@name"/>
+                        <xsl:with-param name="type" select="@name"/>
+                    </xsl:call-template>
+                </xsl:variable>
+                
                 <list begin="" indent="    " end="">
-                    '<xsl:value-of select="@name" />'
+                    '<xsl:value-of select="$name" />'
                     <xsl:if test="position()!=last()">, </xsl:if>
                 </list>
             </xsl:for-each>
             <item>]</item>
         </document>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+    
+    <!-- Template for error handling of missing or reserved names -->
+    <xsl:template name="name">
+        <xsl:param name="name" select="@name"/>
+        <xsl:param name="type" select="@type"/>
+        
+        <xsl:variable name="cleanName">
+            <xsl:call-template name="removeSpecialChars">
+                <xsl:with-param name="text" select="$name"/>
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <xsl:choose>
+            <xsl:when test="contains($name,'EAID_')"><xsl:value-of select="$type"/></xsl:when>
+            <xsl:when test="string-length($cleanName) > 0 and translate(substring($cleanName,1,1),'0123456789','') = ''">_<xsl:value-of select="$cleanName"/></xsl:when>
+            <xsl:when test="$cleanName = 'and'">_and</xsl:when>
+            <xsl:when test="$cleanName = 'as'">_as</xsl:when>
+            <xsl:when test="$cleanName = 'assert'">_assert</xsl:when>
+            <xsl:when test="$cleanName = 'break'">_break</xsl:when>
+            <xsl:when test="$cleanName = 'class'">_class</xsl:when>
+            <xsl:when test="$cleanName = 'continue'">_continue</xsl:when>
+            <xsl:when test="$cleanName = 'def'">_def</xsl:when>
+            <xsl:when test="$cleanName = 'del'">_del</xsl:when>
+            <xsl:when test="$cleanName = 'elif'">_elif</xsl:when>
+            <xsl:when test="$cleanName = 'else'">_else</xsl:when>
+            <xsl:when test="$cleanName = 'except'">_except</xsl:when>
+            <xsl:when test="$cleanName = 'finally'">_finally</xsl:when>
+            <xsl:when test="$cleanName = 'for'">_for</xsl:when>
+            <xsl:when test="$cleanName = 'from'">_from</xsl:when>
+            <xsl:when test="$cleanName = 'global'">_global</xsl:when>
+            <xsl:when test="$cleanName = 'if'">_if</xsl:when>
+            <xsl:when test="$cleanName = 'import'">_import</xsl:when>
+            <xsl:when test="$cleanName = 'in'">_in</xsl:when>
+            <xsl:when test="$cleanName = 'is'">_is</xsl:when>
+            <xsl:when test="$cleanName = 'lambda'">_lambda</xsl:when>
+            <xsl:when test="$cleanName = 'nonlocal'">_nonlocal</xsl:when>
+            <xsl:when test="$cleanName = 'not'">_not</xsl:when>
+            <xsl:when test="$cleanName = 'or'">_or</xsl:when>
+            <xsl:when test="$cleanName = 'pass'">_pass</xsl:when>
+            <xsl:when test="$cleanName = 'raise'">_raise</xsl:when>
+            <xsl:when test="$cleanName = 'return'">_return</xsl:when>
+            <xsl:when test="$cleanName = 'try'">_try</xsl:when>
+            <xsl:when test="$cleanName = 'while'">_while</xsl:when>
+            <xsl:when test="$cleanName = 'with'">_with</xsl:when>
+            <xsl:when test="$cleanName = 'yield'">_yield</xsl:when>
+            <xsl:otherwise><xsl:value-of select="$cleanName"/></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="removeSpecialChars">
+        <xsl:param name="text"/>
+        <xsl:param name="pos" select="1"/>
+        <xsl:param name="result" select="''"/>
+        
+        <xsl:choose>
+            <xsl:when test="$pos > string-length($text)">
+                <xsl:value-of select="$result"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="char" select="substring($text, $pos, 1)"/>
+                <xsl:variable name="validChars" select="'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'"/>
+                <xsl:variable name="isValidChar" select="contains($validChars, $char)"/>
+                
+                <xsl:call-template name="removeSpecialChars">
+                    <xsl:with-param name="text" select="$text"/>
+                    <xsl:with-param name="pos" select="$pos + 1"/>
+                    <xsl:with-param name="result">
+                        <xsl:choose>
+                            <xsl:when test="$isValidChar">
+                                <xsl:value-of select="concat($result, $char)"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="$result"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    
+</xsl:stylesheet>
diff --git a/shipped-builders/cimantic-graphs/cimantic-graphs.xsl b/shipped-builders/cimantic-graphs/cimantic-graphs.xsl
index fdf5f12..6fe9d78 100644
--- a/shipped-builders/cimantic-graphs/cimantic-graphs.xsl
+++ b/shipped-builders/cimantic-graphs/cimantic-graphs.xsl
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This builder is released under a BSD-3 license as part of the CIMantic Graphs library developed by PNNL.
-
-This software was created under a project sponsored by the U.S. Department of Energy’s Office of Electricity, 
-an agency of the United States Government. Neither the United States Government nor the United States Department 
-of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated 
-in the development of these materials, makes any warranty, express or implied, or assumes any legal liability 
-or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, 
-or process disclosed, or represents that its use would not infringe privately owned rights.
-
-Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, 
-or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United 
-States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed 
-herein do not necessarily state or reflect those of the United States Government or any agency thereof.
-
-PACIFIC NORTHWEST NATIONAL LABORATORY operated by BATTELLE for the UNITED STATES DEPARTMENT OF ENERGY 
-under Contract DE-AC05-76RL01830
+     This builder is released under a BSD-3 license as part of the CIMantic Graphs library developed by PNNL.
+     
+     This software was created under a project sponsored by the U.S. Department of Energy’s Office of Electricity, 
+     an agency of the United States Government. Neither the United States Government nor the United States Department 
+     of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated 
+     in the development of these materials, makes any warranty, express or implied, or assumes any legal liability 
+     or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, 
+     or process disclosed, or represents that its use would not infringe privately owned rights.
+     
+     Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, 
+     or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United 
+     States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed 
+     herein do not necessarily state or reflect those of the United States Government or any agency thereof.
+     
+     PACIFIC NORTHWEST NATIONAL LABORATORY operated by BATTELLE for the UNITED STATES DEPARTMENT OF ENERGY 
+     under Contract DE-AC05-76RL01830
 -->
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -43,7 +43,8 @@ under Contract DE-AC05-76RL01830
             <item>from dataclasses import dataclass, field</item>
             <item>from typing import Optional</item>
             <item>from enum import Enum</item>
-            <item>from cimgraph.data_profile.identity import Identity</item>
+            <item>from cimgraph.data_profile.identity import Identity, CIMStereotype, stereotype</item>
+            <item>from cimgraph.data_profile.units import CIMUnit</item>
             <item>_log = logging.getLogger(__name__)</item>
 
             <list begin="'''" indent="    " end="'''">
@@ -55,36 +56,57 @@ under Contract DE-AC05-76RL01830
             <item>BASE_URI = '<xsl:value-of select="$baseURI"/>'</item>
             <item>ONTOLOGY_URI = '<xsl:value-of select="$ontologyURI"/>#'</item>
             <item></item>
-
-        <!-- Start with top-level concrete classes and then work down -->
-        <xsl:for-each select="a:Root[not(a:SuperType)]">
-            <xsl:call-template name="super"/>
-        </xsl:for-each>
-        <!-- Then do top-level abstract classes and work down -->
-        <xsl:for-each select="a:ComplexType[not(a:SuperType)]">
-            <xsl:call-template name="super"/>
-        </xsl:for-each>
-        <!-- Then do all enumerations -->
-        <xsl:for-each select="a:EnumeratedType">
-            <xsl:call-template name="enumeration"/>
-        </xsl:for-each>
-        <!-- Then do all primitives -->
-        <xsl:for-each select="a:SimpleType">
-            <xsl:call-template name="primitive"/>
-        </xsl:for-each>
-        <!-- Then do all compounds -->
-        <xsl:for-each select="a:CompoundType">
-            <xsl:call-template name="super"/>
-        </xsl:for-each>
+            
+            <!-- Start with top-level concrete classes and then work down -->
+            <xsl:for-each select="a:Root[not(a:SuperType)]">
+                <xsl:call-template name="super"/>
+            </xsl:for-each>
+            <!-- Then do top-level abstract classes and work down -->
+            <xsl:for-each select="a:ComplexType[not(a:SuperType)]">
+                <xsl:call-template name="super"/>
+            </xsl:for-each>
+            <!-- Then do all enumerations -->
+            <xsl:for-each select="a:EnumeratedType">
+                <xsl:call-template name="enumeration"/>
+            </xsl:for-each>
+            <!-- Then do all primitives -->
+            <xsl:for-each select="a:SimpleType">
+                <xsl:call-template name="units"/>
+            </xsl:for-each>
+            <!-- Then do all compounds -->
+            <xsl:for-each select="a:CompoundType">
+                <xsl:call-template name="super"/>
+            </xsl:for-each>
         </document>
     </xsl:template>
-
+    
     <!-- Template for top-level classes with no inheritance -->
     <xsl:template name="super">
         <!-- Create dataclass for each CIM class -->
+        
+        <!-- Parse Stereotype -->
+        <xsl:choose>
+            <xsl:when test="a:Stereotype[@label='Description']">
+                <item>@stereotype(CIMStereotype.Description)</item>
+            </xsl:when>
+            <xsl:when test="a:Stereotype[@label='Concrete']">
+                <item>@stereotype(CIMStereotype.Concrete)</item>
+            </xsl:when>
+            <xsl:when test="a:Stereotype/@label">
+                <item>@stereotype(CIMStereotype.<xsl:value-of select="a:Stereotype/@label"/>)</item>
+            </xsl:when>
+        </xsl:choose>
+        
+        <xsl:variable name="name">
+            <xsl:call-template name="name">
+                <xsl:with-param name="name" select="@name"/>
+                <xsl:with-param name="type" select="@name"/>
+            </xsl:call-template>
+        </xsl:variable>
+        
         <item>@dataclass(repr=False)</item>
-        <item>class <xsl:value-of select="@name"/>(Identity):</item>
-
+        <item>class <xsl:value-of select="$name"/>(Identity):</item>
+        
         <!-- Parse all comment text, merge multiple comments into single block -->
         <list begin="    '''" indent="    " end="    '''">
             <xsl:for-each select="a:Comment">
@@ -92,7 +114,7 @@ under Contract DE-AC05-76RL01830
             </xsl:for-each>
         </list>
         <item></item>
-
+        
         <!-- Parse all simple attributes -->
         <xsl:for-each select="a:Simple">
             <list begin="" indent="    " end="">
@@ -116,17 +138,38 @@ under Contract DE-AC05-76RL01830
             <xsl:call-template name="lower"/>
         </xsl:for-each>
     </xsl:template>
-
+    
     <!-- Template for lower level classes -->
     <xsl:template name="lower">
         <!-- Only process the first occurrence of each SuperType -->
         <xsl:if test="generate-id() = generate-id(key('classes-by-super', a:SuperType/@name)[1])">
             <!-- Find all Root elements with the same SuperType -->
             <xsl:for-each select="key('classes-by-super', a:SuperType/@name)">
+                <!-- Parse Stereotype -->
+                <xsl:choose>
+                    <xsl:when test="a:Stereotype[@label='Description']">
+                        <item>@stereotype(CIMStereotype.Description)</item>
+                    </xsl:when>
+                    <xsl:when test="a:Stereotype[@label='Concrete']">
+                        <item>@stereotype(CIMStereotype.Concrete)</item>
+                    </xsl:when>
+                    <xsl:when test="a:Stereotype/@label">
+                        <item>@stereotype(CIMStereotype.<xsl:value-of select="a:Stereotype/@label"/>)</item>
+                    </xsl:when>
+                </xsl:choose>
+                
                 <!-- Create dataclass for each CIM class -->
                 <item>@dataclass(repr=False)</item>
+                
+                <xsl:variable name="name">
+                    <xsl:call-template name="name">
+                        <xsl:with-param name="name" select="@name"/>
+                        <xsl:with-param name="type" select="@name"/>
+                    </xsl:call-template>
+                </xsl:variable>
+                
                 <item>
-                    class <xsl:value-of select="@name"/>(<xsl:value-of select="a:SuperType/@name"/>):
+                    class <xsl:value-of select="$name"/>(<xsl:value-of select="a:SuperType/@name"/>):
                 </item>
                 <!-- Parse all comment text, merge multiple comments into single block -->
                 <list begin="    '''" indent="    " end="    '''">
@@ -135,7 +178,7 @@ under Contract DE-AC05-76RL01830
                     </xsl:for-each>
                 </list>
                 <item></item>
-
+                
                 <!-- Parse all simple attributes -->
                 <xsl:for-each select="a:Simple">
                     <list begin="" indent="    " end="">
@@ -161,7 +204,7 @@ under Contract DE-AC05-76RL01830
             </xsl:for-each>
         </xsl:if>
     </xsl:template>
-
+    
     <!-- Template for Domain attributes with datatypes -->
     <xsl:template name = 'attribute'>
         <!-- Parse attributes with cardinality of 0..1 -->
@@ -206,10 +249,10 @@ under Contract DE-AC05-76RL01830
                 </xsl:for-each>
             </list>
             <item></item>
-
+            
         </xsl:if>
     </xsl:template>
-
+    
     <!-- Template for Simple attributes with primitive datatypes -->
     <xsl:template name = 'simpleattribute'>
         <!-- Parse attributes with cardinality of 0..1 -->
@@ -251,10 +294,10 @@ under Contract DE-AC05-76RL01830
                 </xsl:for-each>
             </list>
             <item></item>
-
+            
         </xsl:if>
     </xsl:template>
-
+    
     <!-- Template for associations with other classes -->
     <xsl:template name = 'assocation'>
         <!-- Parse assocations with cardinality of 0..1 -->
@@ -308,13 +351,20 @@ under Contract DE-AC05-76RL01830
             </xsl:for-each>
         </list>
         <item></item>
-
+        
     </xsl:template>
-
+    
     <!-- Template for enumerations -->
     <xsl:template name="enumeration">
         <!-- Parse enumeration name -->
-        <item>class <xsl:value-of select="@name"/>(Enum):</item>
+        <xsl:variable name="name">
+            <xsl:call-template name="name">
+                <xsl:with-param name="name" select="@name"/>
+                <xsl:with-param name="type" select="@name"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <item>@stereotype(CIMStereotype.Enumeration)</item>
+        <item>class <xsl:value-of select="$name"/>(Enum):</item>
         <!-- Parse all comment text, merge multiple comments into single block -->
         <list begin="    '''" indent="    " end="    '''">
             <xsl:for-each select="a:Comment">
@@ -322,7 +372,7 @@ under Contract DE-AC05-76RL01830
             </xsl:for-each>
         </list>
         <item></item>
-
+        
         <!-- Parse enumeration value -->
         <xsl:for-each select="a:EnumeratedValue">
             <list begin="" indent="    " end="">
@@ -330,38 +380,89 @@ under Contract DE-AC05-76RL01830
             </list>
         </xsl:for-each>
     </xsl:template>
-
-    <!-- Template for primitives -->
-    <xsl:template name="primitive">
-        <xsl:variable name="xstype">
-            <xsl:call-template name="type">
-                <xsl:with-param name="xstype" select="@xstype"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <!-- Parse primitve name and type -->
-        <item>@dataclass</item>
-        <item>class <xsl:value-of select="@name"/>():</item>
-            <list begin="" indent="    " end="">
-                value: <xsl:value-of select="$xstype"/> = field(default=None)
-            </list>
-        <!-- Parse all comment text, merge multiple comments into single block -->
+    
+    <!-- Template for CIM Units as SimpleType -->
+    <xsl:template name="units">
+        <!-- Parse SimpleType name and always inherit from CIMUnit -->
+        <item>@stereotype(CIMStereotype.CIMDatatype)</item>
+        <item>@dataclass(repr=False)</item>
+        <item>class <xsl:value-of select="@name"/>(CIMUnit):</item>
+        
+        <!-- Parse all comment text for the class docstring -->
         <list begin="    '''" indent="    " end="    '''">
             <xsl:for-each select="a:Comment">
                 <xsl:call-template name="comment"/>
             </xsl:for-each>
         </list>
+        
+        <!-- Process Simple elements as regular fields -->
+        <xsl:for-each select="a:Simple">
+            <xsl:variable name="xstype">
+                <xsl:call-template name="type">
+                    <xsl:with-param name="xstype" select="@xstype"/>
+                </xsl:call-template>
+            </xsl:variable>
+            <list begin="" indent="    " end="">
+                <xsl:value-of select="@name"/>: <xsl:value-of select="$xstype"/> = field(default=None)
+            </list>
+        </xsl:for-each>
+        
+        <!-- Process multiplier Enumerated elements as regular fields -->
+        <xsl:for-each select="a:Enumerated[@name='multiplier']">
+            <xsl:variable name="multiplierConstant">
+                <xsl:choose>
+                    <xsl:when test="@constant = '' or @constant = 'none'">none</xsl:when>
+                    <xsl:otherwise><xsl:value-of select="@constant"/></xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <list begin="" indent="    " end="">
+                <xsl:value-of select="@name"/>: <xsl:value-of select="@type"/> = field(default=<xsl:value-of select="@type"/>.<xsl:value-of select="$multiplierConstant"/>)
+            </list>
+        </xsl:for-each>
+        
+        <!-- Process unit Enumerated elements as read-only properties -->
+        <xsl:for-each select="a:Enumerated[@name='unit']">
+            <xsl:variable name="unitConstant">
+                <xsl:choose>
+                    <xsl:when test="@constant = '' or @constant = 'none'">none</xsl:when>
+                    <xsl:otherwise><xsl:value-of select="@constant"/></xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <list begin="" indent="    " end="">
+                @property #read-only
+            </list>
+            <list begin="" indent="    " end="">
+                def <xsl:value-of select="@name"/>(self):
+            </list>
+            <list begin="" indent="        " end="">
+                return <xsl:value-of select="@type"/>.<xsl:value-of select="$unitConstant"/>
+            </list>
+        </xsl:for-each>
+        
+        <!-- Add __init__ method with unit symbol as default -->
+        <xsl:variable name="unitConstant">
+            <xsl:choose>
+                <xsl:when test="a:Enumerated[@name='unit']/@constant = '' or a:Enumerated[@name='unit']/@constant = 'none'">none</xsl:when>
+                <xsl:otherwise><xsl:value-of select="a:Enumerated[@name='unit']/@constant"/></xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <list begin="" indent="    " end="">
+            def __init__(self, value, input_unit:str='<xsl:value-of select="$unitConstant"/>', input_multiplier:str=None):
+        </list>
+        <list begin="" indent="        " end="">
+            self.__pint__(value = value, input_unit=input_unit, input_multiplier=input_multiplier)
+        </list>
+        
         <item></item>
-
-
     </xsl:template>
-
+    
     <!-- Template for wrapping comment text -->
     <xsl:template name="comment">
         <wrap width="70">
             <xsl:value-of select="."/>
         </wrap>
     </xsl:template>
-
+    
     <!-- Template for attribute metadata -->
     <xsl:template name="attr_metadata">
         <!-- Use stereotype label if provided, otherwise, use 'Attribute' -->
@@ -374,17 +475,17 @@ under Contract DE-AC05-76RL01830
         <item> 'minOccurs': '<xsl:value-of select="@minOccurs"/>', </item>
         <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item>
         <item> 'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#' </item>
-
+        
         <!-- Uncomment lines below to include docstring in attribute metadata -->
         <!-- <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item> -->
         <!-- <item> 'docstring': </item> -->
         <!-- <list begin="    '''" indent="    " end="    '''"> -->
-            <!-- <xsl:for-each select="a:Comment"> -->
-                <!-- <xsl:call-template name="comment"/> -->
-            <!-- </xsl:for-each> -->
+        <!-- <xsl:for-each select="a:Comment"> -->
+        <!-- <xsl:call-template name="comment"/> -->
+        <!-- </xsl:for-each> -->
         <!-- </list> -->
     </xsl:template>
-
+    
     <!-- Template for association metadata -->
     <xsl:template name="assc_metadata">
         <!-- Use stereotype label if provided, otherwise, use 'Association' -->
@@ -398,17 +499,40 @@ under Contract DE-AC05-76RL01830
         <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item>
         <item> 'inverse': '<xsl:value-of select="substring-after(@inverseBaseProperty,'#')"/>', </item>
         <item> 'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#' </item>
-
+        
         <!-- Uncomment lines below to include docstring in association metadata -->
         <!-- <item> 'inverse': '<xsl:value-of select="substring-after(@inverseBaseProperty,'#')"/>', </item> -->
         <!-- <item> 'docstring': </item> -->
         <!-- <list begin="    '''" indent="    " end="    '''"> -->
-            <!-- <xsl:for-each select="a:Comment"> -->
-                <!-- <xsl:call-template name="comment"/> -->
-            <!-- </xsl:for-each> -->
+        <!-- <xsl:for-each select="a:Comment"> -->
+        <!-- <xsl:call-template name="comment"/> -->
+        <!-- </xsl:for-each> -->
         <!-- </list> -->
     </xsl:template>
-
+    
+    <!-- Template for attribute metadata -->
+    <xsl:template name="primitive_metadata">
+        <!-- Use stereotype label if provided, otherwise, use 'Attribute' -->
+        <xsl:if test="a:Stereotype/@label">
+            <item> 'type': '<xsl:value-of select="a:Stereotype/@label"/>', </item>
+        </xsl:if>
+        <xsl:if test="not(a:Stereotype/@label)">
+            <item> 'type': 'Attribute', </item>
+        </xsl:if>
+        <item> 'minOccurs': '<xsl:value-of select="@minOccurs"/>', </item>
+        <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item>
+        <item> 'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#' </item>
+        
+        <!-- Uncomment lines below to include docstring in attribute metadata -->
+        <!-- <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item> -->
+        <!-- <item> 'docstring': </item> -->
+        <!-- <list begin="    '''" indent="    " end="    '''"> -->
+        <!-- <xsl:for-each select="a:Comment"> -->
+        <!-- <xsl:call-template name="comment"/> -->
+        <!-- </xsl:for-each> -->
+        <!-- </list> -->
+    </xsl:template>
+    
     <!-- Template for enumeration values -->
     <xsl:template name="enumvalue">
         <!-- Error handling for invalid or missing names -->
@@ -428,9 +552,9 @@ under Contract DE-AC05-76RL01830
             </xsl:for-each>
         </list>
         <item></item>
-
+        
     </xsl:template>
-
+    
     <!-- Template for converting primitives to python spelling -->
     <xsl:template name="type">
         <xsl:param name="xstype" select="@xstype"/>
@@ -443,50 +567,89 @@ under Contract DE-AC05-76RL01830
             <xsl:otherwise>str</xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-
+    
     <!-- Template for error handling of missing or reserved names -->
     <xsl:template name="name">
         <xsl:param name="name" select="@name"/>
         <xsl:param name="type" select="@type"/>
-
+        
+        <xsl:variable name="cleanName">
+            <xsl:call-template name="removeSpecialChars">
+                <xsl:with-param name="text" select="$name"/>
+            </xsl:call-template>
+        </xsl:variable>
+        
         <xsl:choose>
             <xsl:when test="contains($name,'EAID_')"><xsl:value-of select="$type"/></xsl:when>
-            <xsl:when test="$name = 'and'">_and</xsl:when>
-            <xsl:when test="$name = 'as'">_as</xsl:when>
-            <xsl:when test="$name = 'assert'">_assert</xsl:when>
-            <xsl:when test="$name = 'break'">_break</xsl:when>
-            <xsl:when test="$name = 'class'">_class</xsl:when>
-            <xsl:when test="$name = 'continue'">_continue</xsl:when>
-            <xsl:when test="$name = 'def'">_def</xsl:when>
-            <xsl:when test="$name = 'del'">_del</xsl:when>
-            <xsl:when test="$name = 'elif'">_elif</xsl:when>
-            <xsl:when test="$name = 'else'">_else</xsl:when>
-            <xsl:when test="$name = 'except'">_except</xsl:when>
-            <xsl:when test="$name = 'finally'">_finally</xsl:when>
-            <xsl:when test="$name = 'for'">_for</xsl:when>
-            <xsl:when test="$name = 'from'">_from</xsl:when>
-            <xsl:when test="$name = 'global'">_global</xsl:when>
-            <xsl:when test="$name = 'if'">_if</xsl:when>
-            <xsl:when test="$name = 'import'">_import</xsl:when>
-            <xsl:when test="$name = 'in'">_in</xsl:when>
-            <xsl:when test="$name = 'is'">_is</xsl:when>
-            <xsl:when test="$name = 'lambda'">_lambda</xsl:when>
-            <xsl:when test="$name = 'nonlocal'">_nonlocal</xsl:when>
-            <xsl:when test="$name = 'not'">_not</xsl:when>
-            <xsl:when test="$name = 'or'">_or</xsl:when>
-            <xsl:when test="$name = 'pass'">_pass</xsl:when>
-            <xsl:when test="$name = 'raise'">_raise</xsl:when>
-            <xsl:when test="$name = 'return'">_return</xsl:when>
-            <xsl:when test="$name = 'try'">_try</xsl:when>
-            <xsl:when test="$name = 'while'">_while</xsl:when>
-            <xsl:when test="$name = 'with'">_with</xsl:when>
-            <xsl:when test="$name = 'yield'">_yield</xsl:when>
-            <xsl:otherwise><xsl:value-of select="$name"/></xsl:otherwise>
+            <xsl:when test="string-length($cleanName) > 0 and translate(substring($cleanName,1,1),'0123456789','') = ''">_<xsl:value-of select="$cleanName"/></xsl:when>
+            <xsl:when test="$cleanName = 'and'">_and</xsl:when>
+            <xsl:when test="$cleanName = 'as'">_as</xsl:when>
+            <xsl:when test="$cleanName = 'assert'">_assert</xsl:when>
+            <xsl:when test="$cleanName = 'break'">_break</xsl:when>
+            <xsl:when test="$cleanName = 'class'">_class</xsl:when>
+            <xsl:when test="$cleanName = 'continue'">_continue</xsl:when>
+            <xsl:when test="$cleanName = 'def'">_def</xsl:when>
+            <xsl:when test="$cleanName = 'del'">_del</xsl:when>
+            <xsl:when test="$cleanName = 'elif'">_elif</xsl:when>
+            <xsl:when test="$cleanName = 'else'">_else</xsl:when>
+            <xsl:when test="$cleanName = 'except'">_except</xsl:when>
+            <xsl:when test="$cleanName = 'finally'">_finally</xsl:when>
+            <xsl:when test="$cleanName = 'for'">_for</xsl:when>
+            <xsl:when test="$cleanName = 'from'">_from</xsl:when>
+            <xsl:when test="$cleanName = 'global'">_global</xsl:when>
+            <xsl:when test="$cleanName = 'if'">_if</xsl:when>
+            <xsl:when test="$cleanName = 'import'">_import</xsl:when>
+            <xsl:when test="$cleanName = 'in'">_in</xsl:when>
+            <xsl:when test="$cleanName = 'is'">_is</xsl:when>
+            <xsl:when test="$cleanName = 'lambda'">_lambda</xsl:when>
+            <xsl:when test="$cleanName = 'nonlocal'">_nonlocal</xsl:when>
+            <xsl:when test="$cleanName = 'not'">_not</xsl:when>
+            <xsl:when test="$cleanName = 'or'">_or</xsl:when>
+            <xsl:when test="$cleanName = 'pass'">_pass</xsl:when>
+            <xsl:when test="$cleanName = 'raise'">_raise</xsl:when>
+            <xsl:when test="$cleanName = 'return'">_return</xsl:when>
+            <xsl:when test="$cleanName = 'try'">_try</xsl:when>
+            <xsl:when test="$cleanName = 'while'">_while</xsl:when>
+            <xsl:when test="$cleanName = 'with'">_with</xsl:when>
+            <xsl:when test="$cleanName = 'yield'">_yield</xsl:when>
+            <xsl:otherwise><xsl:value-of select="$cleanName"/></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <xsl:template name="removeSpecialChars">
+        <xsl:param name="text"/>
+        <xsl:param name="pos" select="1"/>
+        <xsl:param name="result" select="''"/>
+        
+        <xsl:choose>
+            <xsl:when test="$pos > string-length($text)">
+                <xsl:value-of select="$result"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="char" select="substring($text, $pos, 1)"/>
+                <xsl:variable name="validChars" select="'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'"/>
+                <xsl:variable name="isValidChar" select="contains($validChars, $char)"/>
+                
+                <xsl:call-template name="removeSpecialChars">
+                    <xsl:with-param name="text" select="$text"/>
+                    <xsl:with-param name="pos" select="$pos + 1"/>
+                    <xsl:with-param name="result">
+                        <xsl:choose>
+                            <xsl:when test="$isValidChar">
+                                <xsl:value-of select="concat($result, $char)"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="$result"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
 
 </xsl:stylesheet>
 
 <!-- <list begin="" indent="    " end=""> -->
-    <!-- <item> </item> -->
+<!-- <item> </item> -->
 <!-- </list> -->

From 148a5d47bcd0d5b8bb56cb4807c64ff034bc5885 Mon Sep 17 00:00:00 2001
From: "Dr. Alex A. Anderson" <alexander.a.anderson@ieee.org>
Date: Tue, 1 Jul 2025 14:24:03 -0700
Subject: [PATCH 2/2] update to XSL 3.0 for InverseReference

---
 .../cimantic-graphs/cimantic-graphs.xsl       | 925 +++++++-----------
 1 file changed, 379 insertions(+), 546 deletions(-)

diff --git a/shipped-builders/cimantic-graphs/cimantic-graphs.xsl b/shipped-builders/cimantic-graphs/cimantic-graphs.xsl
index 6fe9d78..b2fc6c8 100644
--- a/shipped-builders/cimantic-graphs/cimantic-graphs.xsl
+++ b/shipped-builders/cimantic-graphs/cimantic-graphs.xsl
@@ -1,89 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     This builder is released under a BSD-3 license as part of the CIMantic Graphs library developed by PNNL.
-     
-     This software was created under a project sponsored by the U.S. Department of Energy’s Office of Electricity, 
-     an agency of the United States Government. Neither the United States Government nor the United States Department 
-     of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated 
-     in the development of these materials, makes any warranty, express or implied, or assumes any legal liability 
-     or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, 
-     or process disclosed, or represents that its use would not infringe privately owned rights.
-     
-     Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, 
-     or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United 
-     States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed 
-     herein do not necessarily state or reflect those of the United States Government or any agency thereof.
-     
-     PACIFIC NORTHWEST NATIONAL LABORATORY operated by BATTELLE for the UNITED STATES DEPARTMENT OF ENERGY 
-     under Contract DE-AC05-76RL01830
+    This builder is released under a BSD-3 license as part of the CIMantic Graphs library developed by PNNL.
+        
+    This software was created under a project sponsored by the U.S. Department of Energy’s Office of Electricity, 
+    an agency of the United States Government. Neither the United States Government nor the United States Department 
+    of Energy, nor Battelle, nor any of their employees, nor any jurisdiction or organization that has cooperated 
+    in the development of these materials, makes any warranty, express or implied, or assumes any legal liability 
+    or responsibility for the accuracy, completeness, or usefulness or any information, apparatus, product, software, 
+    or process disclosed, or represents that its use would not infringe privately owned rights.
+    
+    Reference herein to any specific commercial product, process, or service by trade name, trademark, manufacturer, 
+    or otherwise does not necessarily constitute or imply its endorsement, recommendation, or favoring by the United 
+    States Government or any agency thereof, or Battelle Memorial Institute. The views and opinions of authors expressed 
+    herein do not necessarily state or reflect those of the United States Government or any agency thereof.
+    
+    PACIFIC NORTHWEST NATIONAL LABORATORY
+    operated by BATTELLE
+    for the UNITED STATES DEPARTMENT OF ENERGY 
+    under Contract DE-AC05-76RL01830
 -->
-<xsl:stylesheet version="1.0"
+    <xsl:stylesheet version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:a="http://langdale.com.au/2005/Message#"
     xmlns:sawsdl="http://www.w3.org/ns/sawsdl"
-    xmlns="http://langdale.com.au/2009/Indent">
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
+    xmlns:local="urn:local-functions"
+    xmlns="http://langdale.com.au/2009/Indent"
+    exclude-result-prefixes="xs fn local">
+
+    <xsl:output indent="yes" method="xml" encoding="utf-8"/>
 
-    <xsl:output indent="yes" method="xml" encoding="utf-8" />
-    <xsl:param name="version"/>
-    <xsl:param name="baseURI"/>
-    <xsl:param name="ontologyURI"/>
-    <xsl:param name="envelope">Profile</xsl:param>
-    <xsl:param name="package">au.com.langdale.cimtool.generated</xsl:param>
+    <!-- Parameters with default values -->
+    <xsl:param name="version" as="xs:string?" select="()"/>
+    <xsl:param name="baseURI" as="xs:string" required="yes"/>
+    <xsl:param name="ontologyURI" as="xs:string" required="yes"/>
+    <xsl:param name="envelope" as="xs:string" select="'Profile'"/>
+    <xsl:param name="package" as="xs:string" select="'au.com.langdale.cimtool.generated'"/>
 
     <!-- Key for tracing parent-child inheritance -->
-    <xsl:key name="classes-by-super" match="a:Root|a:ComplexType" use="a:SuperType/@name"/>
+    <xsl:key name="classes-by-super" match="a:Root | a:ComplexType" use="a:SuperType/@name"/>
+
+    <!-- Key for finding inverse references by target class -->
+    <xsl:key name="inverse-references" match="a:InverseReference" use="substring-after(@inverseBasePropertyClass, '#')"/>
+
+    <xsl:variable name="python-keywords" as="xs:string*" select="(
+            'and', 'as', 'assert', 'break', 'class', 'continue', 'def', 'del', 
+            'elif', 'else', 'except', 'finally', 'for', 'from', 'global', 'if', 
+            'import', 'in', 'is', 'lambda', 'nonlocal', 'not', 'or', 'pass', 
+            'raise', 'return', 'try', 'while', 'with', 'yield'
+        )"/>
 
     <!-- Template for top-level item in schema file -->
     <xsl:template match="a:Catalog">
         <document>
-            <!-- Header text with library imports -->
-            <item>from __future__ import annotations</item>
-            <item>import logging</item>
-            <item>from dataclasses import dataclass, field</item>
-            <item>from typing import Optional</item>
-            <item>from enum import Enum</item>
-            <item>from cimgraph.data_profile.identity import Identity, CIMStereotype, stereotype</item>
-            <item>from cimgraph.data_profile.units import CIMUnit</item>
-            <item>_log = logging.getLogger(__name__)</item>
-
-            <list begin="'''" indent="    " end="'''">
-                <item>Annotated CIMantic Graphs data profile for <xsl:value-of select="$envelope" /></item>
-                <item>Generated by CIMTool http://cimtool.org</item>
-            </list>
-
-            <item></item>
+            <!-- Header imports -->
+            <xsl:call-template name="generate-imports"/>
+            
+            <!-- Documentation -->
+            <xsl:call-template name="generate-documentation"/>
+            
+            <!-- Constants -->
             <item>BASE_URI = '<xsl:value-of select="$baseURI"/>'</item>
             <item>ONTOLOGY_URI = '<xsl:value-of select="$ontologyURI"/>#'</item>
-            <item></item>
+            <item/>
             
-            <!-- Start with top-level concrete classes and then work down -->
-            <xsl:for-each select="a:Root[not(a:SuperType)]">
-                <xsl:call-template name="super"/>
-            </xsl:for-each>
-            <!-- Then do top-level abstract classes and work down -->
-            <xsl:for-each select="a:ComplexType[not(a:SuperType)]">
-                <xsl:call-template name="super"/>
-            </xsl:for-each>
-            <!-- Then do all enumerations -->
-            <xsl:for-each select="a:EnumeratedType">
-                <xsl:call-template name="enumeration"/>
-            </xsl:for-each>
-            <!-- Then do all primitives -->
-            <xsl:for-each select="a:SimpleType">
-                <xsl:call-template name="units"/>
-            </xsl:for-each>
-            <!-- Then do all compounds -->
-            <xsl:for-each select="a:CompoundType">
-                <xsl:call-template name="super"/>
-            </xsl:for-each>
+            <!-- Process classes hierarchically -->
+            <xsl:apply-templates select="a:Root[not(a:SuperType)] | a:ComplexType[not(a:SuperType)]" mode="super"/>
+            
+            <!-- Process enumerations -->
+            <xsl:apply-templates select="a:EnumeratedType" mode="enumeration"/>
+            
+            <!-- Process primitives -->
+            <xsl:apply-templates select="a:SimpleType" mode="units"/>
+            
+            <!-- Process compounds -->
+            <xsl:apply-templates select="a:CompoundType" mode="super"/>
         </document>
     </xsl:template>
-    
+
+    <!-- Generate imports section -->
+    <xsl:template name="generate-imports">
+        <item>from __future__ import annotations</item>
+        <item>import logging</item>
+        <item>from dataclasses import dataclass, field</item>
+        <item>from typing import Optional</item>
+        <item>from enum import Enum</item>
+        <item>from cimgraph.data_profile.identity import Identity, CIMStereotype, stereotype</item>
+        <item>from cimgraph.data_profile.units import CIMUnit, UnitSymbol, UnitMultiplier</item>
+        <item>_log = logging.getLogger(__name__)</item>
+    </xsl:template>
+
+    <!-- Generate documentation section -->
+    <xsl:template name="generate-documentation">
+        <list begin="'''" indent="    " end="'''">
+            <item>Annotated CIMantic Graphs data profile for <xsl:value-of select="$envelope"/></item>
+            <item>Generated by CIMTool http://cimtool.org</item>
+        </list>
+        <item/>
+    </xsl:template>
+
     <!-- Template for top-level classes with no inheritance -->
-    <xsl:template name="super">
-        <!-- Create dataclass for each CIM class -->
+    <xsl:template match="a:Root | a:ComplexType | a:CompoundType" mode="super">
+        <xsl:call-template name="generate-stereotype"/>
+        
+        <xsl:variable name="class-name" select="local:sanitize-name(@name, @name)"/>
+        
+        <item>@dataclass(repr=False)</item>
+        <item>class <xsl:value-of select="$class-name"/>(Identity):</item>
+        
+        <xsl:call-template name="generate-class-docstring"/>
+        
+        <!-- Process inverse references first (they come from other classes) -->
+        <xsl:apply-templates select="key('inverse-references', @name)" mode="inverse-association"/>
+        
+        <!-- Process attributes -->
+        <xsl:apply-templates select="a:Simple" mode="simple-attribute"/>
+        <xsl:apply-templates select="a:Domain | a:Enumerated" mode="attribute"/>
+        <xsl:apply-templates select="a:Instance | a:Reference" mode="association"/>
         
+        <!-- Process child classes -->
+        <xsl:apply-templates select="key('classes-by-super', @name)" mode="lower"/>
+    </xsl:template>
+
+    <!-- Template for lower level classes -->
+    <xsl:template match="a:Root | a:ComplexType" mode="lower">
+        <xsl:if test=". is key('classes-by-super', a:SuperType/@name)[1]">
+            <xsl:for-each select="key('classes-by-super', a:SuperType/@name)">
+                <xsl:call-template name="generate-stereotype"/>
+                
+                <item>@dataclass(repr=False)</item>
+                
+                <xsl:variable name="class-name" select="local:sanitize-name(@name, @name)"/>
+                <item>class <xsl:value-of select="$class-name"/>(<xsl:value-of select="a:SuperType/@name"/>):</item>
+                
+                <xsl:call-template name="generate-class-docstring"/>
+                
+                <!-- Process inverse references first (they come from other classes) -->
+                <xsl:apply-templates select="key('inverse-references', @name)" mode="inverse-association"/>
+                
+                <!-- Process attributes -->
+                <xsl:apply-templates select="a:Simple" mode="simple-attribute"/>
+                <xsl:apply-templates select="a:Domain | a:Enumerated" mode="attribute"/>
+                <xsl:apply-templates select="a:Instance | a:Reference" mode="association"/>
+                
+                <!-- Process child classes -->
+                <xsl:apply-templates select="key('classes-by-super', @name)" mode="lower"/>
+            </xsl:for-each>
+        </xsl:if>
+    </xsl:template>
+
+    <!-- Generate stereotype decorator -->
+    <xsl:template name="generate-stereotype">
+        <xsl:variable name="stereotype-label" select="a:Stereotype/@label"/>
         <!-- Parse Stereotype -->
         <xsl:choose>
             <xsl:when test="a:Stereotype[@label='Description']">
@@ -92,564 +161,328 @@
             <xsl:when test="a:Stereotype[@label='Concrete']">
                 <item>@stereotype(CIMStereotype.Concrete)</item>
             </xsl:when>
+            <xsl:when test="a:Stereotype[@label='ByReference']">
+                <item>@stereotype(CIMStereotype.ByReference)</item>
+            </xsl:when>
             <xsl:when test="a:Stereotype/@label">
                 <item>@stereotype(CIMStereotype.<xsl:value-of select="a:Stereotype/@label"/>)</item>
             </xsl:when>
         </xsl:choose>
-        
-        <xsl:variable name="name">
-            <xsl:call-template name="name">
-                <xsl:with-param name="name" select="@name"/>
-                <xsl:with-param name="type" select="@name"/>
-            </xsl:call-template>
-        </xsl:variable>
-        
-        <item>@dataclass(repr=False)</item>
-        <item>class <xsl:value-of select="$name"/>(Identity):</item>
-        
-        <!-- Parse all comment text, merge multiple comments into single block -->
-        <list begin="    '''" indent="    " end="    '''">
-            <xsl:for-each select="a:Comment">
-                <xsl:call-template name="comment"/>
-            </xsl:for-each>
-        </list>
-        <item></item>
-        
-        <!-- Parse all simple attributes -->
-        <xsl:for-each select="a:Simple">
-            <list begin="" indent="    " end="">
-                <xsl:call-template name="simpleattribute"/>
-            </list>
-        </xsl:for-each>
-        <!-- Parse all attributes with datatypes / units -->
-        <xsl:for-each select="a:Domain|a:Enumerated">
-            <list begin="" indent="    " end="">
-                <xsl:call-template name="attribute"/>
-            </list>
-        </xsl:for-each>
-        <!-- Parse all associations to other classes -->
-        <xsl:for-each select="a:Instance|a:Reference">
-            <list begin="" indent="    " end="">
-                <xsl:call-template name="assocation"/>
-            </list>
-        </xsl:for-each>
-        <!-- Parse all child classes inheriting from top-level class -->
-        <xsl:for-each select="key('classes-by-super', @name)">
-            <xsl:call-template name="lower"/>
-        </xsl:for-each>
     </xsl:template>
-    
-    <!-- Template for lower level classes -->
-    <xsl:template name="lower">
-        <!-- Only process the first occurrence of each SuperType -->
-        <xsl:if test="generate-id() = generate-id(key('classes-by-super', a:SuperType/@name)[1])">
-            <!-- Find all Root elements with the same SuperType -->
-            <xsl:for-each select="key('classes-by-super', a:SuperType/@name)">
-                <!-- Parse Stereotype -->
-                <xsl:choose>
-                    <xsl:when test="a:Stereotype[@label='Description']">
-                        <item>@stereotype(CIMStereotype.Description)</item>
-                    </xsl:when>
-                    <xsl:when test="a:Stereotype[@label='Concrete']">
-                        <item>@stereotype(CIMStereotype.Concrete)</item>
-                    </xsl:when>
-                    <xsl:when test="a:Stereotype/@label">
-                        <item>@stereotype(CIMStereotype.<xsl:value-of select="a:Stereotype/@label"/>)</item>
-                    </xsl:when>
-                </xsl:choose>
-                
-                <!-- Create dataclass for each CIM class -->
-                <item>@dataclass(repr=False)</item>
-                
-                <xsl:variable name="name">
-                    <xsl:call-template name="name">
-                        <xsl:with-param name="name" select="@name"/>
-                        <xsl:with-param name="type" select="@name"/>
-                    </xsl:call-template>
-                </xsl:variable>
-                
-                <item>
-                    class <xsl:value-of select="$name"/>(<xsl:value-of select="a:SuperType/@name"/>):
-                </item>
-                <!-- Parse all comment text, merge multiple comments into single block -->
-                <list begin="    '''" indent="    " end="    '''">
-                    <xsl:for-each select="a:Comment">
-                        <xsl:call-template name="comment"/>
-                    </xsl:for-each>
-                </list>
-                <item></item>
-                
-                <!-- Parse all simple attributes -->
-                <xsl:for-each select="a:Simple">
-                    <list begin="" indent="    " end="">
-                        <xsl:call-template name="simpleattribute"/>
-                    </list>
-                </xsl:for-each>
-                <!-- Parse all attributes with datatypes / units -->
-                <xsl:for-each select="a:Domain|a:Enumerated">
-                    <list begin="" indent="    " end="">
-                        <xsl:call-template name="attribute"/>
-                    </list>
-                </xsl:for-each>
-                <!-- Parse all associations to other classes -->
-                <xsl:for-each select="a:Instance|a:Reference">
-                    <list begin="" indent="    " end="">
-                        <xsl:call-template name="assocation"/>
-                    </list>
-                </xsl:for-each>
-                <!-- Parse all child classes inheriting from current class -->
-                <xsl:for-each select="key('classes-by-super', @name)">
-                    <xsl:call-template name="lower"/>
+
+    <!-- Generate class docstring -->
+    <xsl:template name="generate-class-docstring">
+        <xsl:if test="a:Comment">
+            <list begin="    '''" indent="    " end="    '''">
+                <xsl:for-each select="a:Comment">
+                    <wrap width="70">
+                        <xsl:value-of select="."/>
+                    </wrap>
                 </xsl:for-each>
-            </xsl:for-each>
+            </list>
+            <item/>
         </xsl:if>
     </xsl:template>
-    
-    <!-- Template for Domain attributes with datatypes -->
-    <xsl:template name = 'attribute'>
-        <!-- Parse attributes with cardinality of 0..1 -->
-        <!-- Typing is Optional, default is None -->
-        <xsl:if test="@maxOccurs &lt;= 1">
-            <xsl:variable name="xstype">
-                <xsl:call-template name="type">
-                    <xsl:with-param name="xstype" select="@xstype"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <!-- Write dataclass field with typing and default -->
+
+    <!-- Template for processing inverse references -->
+    <xsl:template match="a:InverseReference" mode="inverse-association">
+        <xsl:variable name="field-name" select="local:sanitize-name(@name, (@type, 'unknown')[1])"/>
+        <xsl:variable name="target-type" select="@type"/>
+        <xsl:variable name="inverse-property" select="substring-after(@inverseBaseProperty, '#')"/>
+        
+        <list begin="" indent="    " end="">
             <xsl:choose>
-                <xsl:when test="$xstype = 'str'">
+                <xsl:when test="(@maxOccurs castable as xs:integer and xs:integer(@maxOccurs) le 1) or @maxOccurs = '1' or @maxOccurs = '0'">
                     <item>
-                        <xsl:value-of select="@name"/>: Optional[
-                        <xsl:value-of select="@type"/> ] = field(
+                        <xsl:value-of select="$field-name"/>: Optional[<xsl:value-of select="$target-type"/>] = field( 
                     </item>
+                    <list begin="" indent="    " end="">
+                        <item>default=None,</item>
+                    </list>
                 </xsl:when>
                 <xsl:otherwise>
                     <item>
-                        <xsl:value-of select="@name"/>: Optional[
-                        <xsl:value-of select="$xstype"/>  |
-                        <xsl:value-of select="@type"/> ] = field(
+                        <xsl:value-of select="$field-name"/>: list[<xsl:value-of select="$target-type"/>] = field(
                     </item>
+                    <list begin="" indent="    " end="">
+                        <item>default_factory=list,</item>
+                    </list>
                 </xsl:otherwise>
             </xsl:choose>
+            
             <list begin="" indent="    " end="">
-                default = None,
+                <item>metadata={</item>
+                <xsl:call-template name="generate-inverse-association-metadata"/>
+                <item>})</item>
             </list>
-            <!-- Write metadata regarding cardinality, etc. -->
+            
+            <xsl:if test="a:Comment">
+                <list begin="'''" indent="" end="'''">
+                    <xsl:for-each select="a:Comment">
+                        <wrap width="66">
+                            <xsl:value-of select="."/>
+                        </wrap>
+                    </xsl:for-each>
+                </list>
+            </xsl:if>
+            <item/>
+        </list>
+    </xsl:template>
+
+    <!-- Template for Domain attributes with datatypes -->
+    <xsl:template match="a:Domain | a:Enumerated" mode="attribute">
+        <xsl:if test="(@maxOccurs castable as xs:integer and xs:integer(@maxOccurs) le 1) or @maxOccurs = '1' or @maxOccurs = '0'">
+            <xsl:variable name="python-type" select="local:get-python-type(@xstype)"/>
+            <xsl:variable name="field-name" select="local:sanitize-name(@name, (@type, 'unknown')[1])"/>
+            
             <list begin="" indent="    " end="">
-                metadata = {
+                <item>
+                    <xsl:value-of select="$field-name"/>: Optional[
+                    <xsl:choose>
+                        <xsl:when test="$python-type = 'str'">
+                            <xsl:value-of select="(@type, 'str')[1]"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$python-type"/> | <xsl:value-of select="(@type, 'str')[1]"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    ] = field(
+                </item>
+                
                 <list begin="" indent="    " end="">
-                    <xsl:call-template name="attr_metadata"/>
+                    <item>default=None,</item>
+                    <item>metadata={</item>
+                    <xsl:call-template name="generate-attribute-metadata"/>
+                    <item>})</item>
                 </list>
-                })
-            </list>
-            <!-- Parse all comment text, merge multiple comments into single block -->
-            <list begin="'''" indent="" end="'''">
-                <xsl:for-each select="a:Comment">
-                    <xsl:call-template name="comment"/>
-                </xsl:for-each>
+                
+                <xsl:if test="a:Comment">
+                    <list begin="'''" indent="" end="'''">
+                        <xsl:for-each select="a:Comment">
+                            <wrap width="66">
+                                <xsl:value-of select="."/>
+                            </wrap>
+                        </xsl:for-each>
+                    </list>
+                </xsl:if>
+                <item/>
             </list>
-            <item></item>
-            
         </xsl:if>
     </xsl:template>
-    
+
     <!-- Template for Simple attributes with primitive datatypes -->
-    <xsl:template name = 'simpleattribute'>
-        <!-- Parse attributes with cardinality of 0..1 -->
-        <!-- Typing is Optional, default is None -->
-        <xsl:if test="@maxOccurs &lt;= 1">
-            <!-- Convert CIM primitives to python typing -->
-            <xsl:variable name="xstype">
-                <xsl:call-template name="type">
-                    <xsl:with-param name="xstype" select="@xstype"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <!-- Error handling for invalid or missing names -->
-            <xsl:variable name="name">
-                <xsl:call-template name="name">
-                    <xsl:with-param name="name" select="@name"/>
-                    <xsl:with-param name="type" select="@xstype"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <!-- Write dataclass field with typing and default -->
-            <item>
-                <xsl:value-of select="$name"/>: Optional[
-                <xsl:value-of select="$xstype"/> ] = field(
-            </item>
-            <list begin="" indent="    " end="">
-                default = None,
-            </list>
-            <!-- Write metadata regarding cardinality, etc. -->
+    <xsl:template match="a:Simple" mode="simple-attribute">
+        <xsl:if test="(@maxOccurs castable as xs:integer and xs:integer(@maxOccurs) le 1) or @maxOccurs = '1' or @maxOccurs = '0'">
+            <xsl:variable name="python-type" select="local:get-python-type(@xstype)"/>
+            <xsl:variable name="field-name" select="local:sanitize-name(@name, (@xstype, 'unknown')[1])"/>
+            
             <list begin="" indent="    " end="">
-                metadata = {
+                <item>
+                    <xsl:value-of select="$field-name"/>: Optional[<xsl:value-of select="$python-type"/>] = field(
+                </item>
+                
                 <list begin="" indent="    " end="">
-                    <xsl:call-template name="attr_metadata"/>
+                    <item>default=None,</item>
+                    <item>metadata={</item>
+                    <xsl:call-template name="generate-attribute-metadata"/>
+                    <item>})</item>
                 </list>
-                })
-            </list>
-            <!-- Parse all comment text, merge multiple comments into single block -->
-            <list begin="'''" indent="" end="'''">
-                <xsl:for-each select="a:Comment">
-                    <xsl:call-template name="comment"/>
-                </xsl:for-each>
+                
+                <xsl:if test="a:Comment">
+                    <list begin="'''" indent="" end="'''">
+                        <xsl:for-each select="a:Comment">
+                            <wrap width="66">
+                                <xsl:value-of select="."/>
+                            </wrap>
+                        </xsl:for-each>
+                    </list>
+                </xsl:if>
+                <item/>
             </list>
-            <item></item>
-            
         </xsl:if>
     </xsl:template>
-    
+
     <!-- Template for associations with other classes -->
-    <xsl:template name = 'assocation'>
-        <!-- Parse assocations with cardinality of 0..1 -->
-        <!-- Typing is Optional, default is None -->
-        <xsl:if test="@maxOccurs &lt;= 1">
-            <!-- Error handling for invalid or missing names -->
-            <xsl:variable name="name">
-                <xsl:call-template name="name">
-                    <xsl:with-param name="name" select="@name"/>
-                    <xsl:with-param name="type" select="@type"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <!-- Write dataclass field with typing and default -->
-            <item>
-                <xsl:value-of select="$name"/>: Optional[<xsl:value-of select="@type"/>] = field(
-            </item>
-            <list begin="" indent="    " end="">
-                default = None,
-            </list>
-        </xsl:if>
-        <!-- Parse datatype of attributes with cardinality of many -->
-        <!-- Typing is List, default is [] -->
-        <xsl:if test="@maxOccurs &gt; 1 or @maxOccurs = 'unbounded'">
-            <!-- Error handling for invalid or missing names -->
-            <xsl:variable name="name">
-                <xsl:call-template name="name">
-                    <xsl:with-param name="name" select="@name"/>
-                    <xsl:with-param name="type" select="@type"/>
-                </xsl:call-template>
-            </xsl:variable>
-            <!-- Write dataclass field with typing and default -->
-            <item>
-                <xsl:value-of select="$name"/>: list[<xsl:value-of select="@type"/>] = field(
-            </item>
-            <list begin="" indent="    " end="">
-                default_factory = list,
-            </list>
-        </xsl:if>
-        <!-- Write metadata regarding cardinality, inverse, etc. -->
+    <xsl:template match="a:Instance | a:Reference" mode="association">
+        <xsl:variable name="field-name" select="local:sanitize-name(@name, (@type, 'unknown')[1])"/>
+        
         <list begin="" indent="    " end="">
-            metadata = {
+            <xsl:choose>
+                <xsl:when test="(@maxOccurs castable as xs:integer and xs:integer(@maxOccurs) le 1) or @maxOccurs = '1' or @maxOccurs = '0'">
+                    <item>
+                        <xsl:value-of select="$field-name"/>: Optional[<xsl:value-of select="(@type, 'object')[1]"/>] = field(
+                    </item>
+                    <list begin="" indent="    " end="">
+                        <item>default=None,</item>
+                    </list>
+                </xsl:when>
+                <xsl:otherwise>
+                    <item>
+                        <xsl:value-of select="$field-name"/>: list[<xsl:value-of select="(@type, 'object')[1]"/>] = field(
+                    </item>
+                    <list begin="" indent="    " end="">
+                        <item>default_factory=list,</item>
+                    </list>
+                </xsl:otherwise>
+            </xsl:choose>
+            
             <list begin="" indent="    " end="">
-                <xsl:call-template name="assc_metadata"/>
+                <item>metadata={</item>
+                <xsl:call-template name="generate-association-metadata"/>
+                <item>})</item>
             </list>
-            })
-        </list>
-        <!-- Parse all comment text, merge multiple comments into single block -->
-        <list begin="'''" indent="" end="'''">
-            <xsl:for-each select="a:Comment">
-                <xsl:call-template name="comment"/>
-            </xsl:for-each>
+            
+            <xsl:if test="a:Comment">
+                <list begin="'''" indent="" end="'''">
+                    <xsl:for-each select="a:Comment">
+                        <wrap width="66">
+                            <xsl:value-of select="."/>
+                        </wrap>
+                    </xsl:for-each>
+                </list>
+            </xsl:if>
+            <item/>
         </list>
-        <item></item>
-        
     </xsl:template>
-    
+
     <!-- Template for enumerations -->
-    <xsl:template name="enumeration">
-        <!-- Parse enumeration name -->
-        <xsl:variable name="name">
-            <xsl:call-template name="name">
-                <xsl:with-param name="name" select="@name"/>
-                <xsl:with-param name="type" select="@name"/>
-            </xsl:call-template>
-        </xsl:variable>
+    <xsl:template match="a:EnumeratedType" mode="enumeration">
+        <xsl:variable name="enum-name" select="local:sanitize-name(@name, @name)"/>
+        
         <item>@stereotype(CIMStereotype.Enumeration)</item>
-        <item>class <xsl:value-of select="$name"/>(Enum):</item>
-        <!-- Parse all comment text, merge multiple comments into single block -->
-        <list begin="    '''" indent="    " end="    '''">
-            <xsl:for-each select="a:Comment">
-                <xsl:call-template name="comment"/>
-            </xsl:for-each>
-        </list>
-        <item></item>
+        <item>class <xsl:value-of select="$enum-name"/>(Enum):</item>
+        
+        <xsl:call-template name="generate-class-docstring"/>
         
-        <!-- Parse enumeration value -->
         <xsl:for-each select="a:EnumeratedValue">
+            <xsl:variable name="value-name" select="local:sanitize-name(@name, @name)"/>
             <list begin="" indent="    " end="">
-                <xsl:call-template name="enumvalue"/>
+                <item><xsl:value-of select="$value-name"/> = '<xsl:value-of select="$value-name"/>'</item>
+                <xsl:if test="a:Comment">
+                    <list begin="'''" indent="" end="'''">
+                        <xsl:for-each select="a:Comment">
+                            <wrap width="66">
+                                <xsl:value-of select="."/>
+                            </wrap>
+                        </xsl:for-each>
+                    </list>
+                </xsl:if>
+                <item/>
             </list>
         </xsl:for-each>
     </xsl:template>
-    
+
     <!-- Template for CIM Units as SimpleType -->
-    <xsl:template name="units">
-        <!-- Parse SimpleType name and always inherit from CIMUnit -->
+    <xsl:template match="a:SimpleType" mode="units">
         <item>@stereotype(CIMStereotype.CIMDatatype)</item>
         <item>@dataclass(repr=False)</item>
         <item>class <xsl:value-of select="@name"/>(CIMUnit):</item>
         
-        <!-- Parse all comment text for the class docstring -->
-        <list begin="    '''" indent="    " end="    '''">
-            <xsl:for-each select="a:Comment">
-                <xsl:call-template name="comment"/>
-            </xsl:for-each>
-        </list>
+        <xsl:call-template name="generate-class-docstring"/>
         
-        <!-- Process Simple elements as regular fields -->
+        <!-- Process Simple elements -->
         <xsl:for-each select="a:Simple">
-            <xsl:variable name="xstype">
-                <xsl:call-template name="type">
-                    <xsl:with-param name="xstype" select="@xstype"/>
-                </xsl:call-template>
-            </xsl:variable>
+            <xsl:variable name="python-type" select="local:get-python-type(@xstype)"/>
             <list begin="" indent="    " end="">
-                <xsl:value-of select="@name"/>: <xsl:value-of select="$xstype"/> = field(default=None)
+                <item><xsl:value-of select="@name"/>: <xsl:value-of select="$python-type"/> = field(default=None)</item>
             </list>
         </xsl:for-each>
         
-        <!-- Process multiplier Enumerated elements as regular fields -->
+        <!-- Process multiplier fields -->
         <xsl:for-each select="a:Enumerated[@name='multiplier']">
-            <xsl:variable name="multiplierConstant">
-                <xsl:choose>
-                    <xsl:when test="@constant = '' or @constant = 'none'">none</xsl:when>
-                    <xsl:otherwise><xsl:value-of select="@constant"/></xsl:otherwise>
-                </xsl:choose>
-            </xsl:variable>
+            <xsl:variable name="multiplier-const" select="if (@constant = '' or @constant = 'none') then 'none' else @constant"/>
             <list begin="" indent="    " end="">
-                <xsl:value-of select="@name"/>: <xsl:value-of select="@type"/> = field(default=<xsl:value-of select="@type"/>.<xsl:value-of select="$multiplierConstant"/>)
+                <item><xsl:value-of select="@name"/>: <xsl:value-of select="@type"/> = field(default=<xsl:value-of select="@type"/>.<xsl:value-of select="$multiplier-const"/>)</item>
             </list>
         </xsl:for-each>
         
-        <!-- Process unit Enumerated elements as read-only properties -->
+        <!-- Process unit fields as properties -->
         <xsl:for-each select="a:Enumerated[@name='unit']">
-            <xsl:variable name="unitConstant">
-                <xsl:choose>
-                    <xsl:when test="@constant = '' or @constant = 'none'">none</xsl:when>
-                    <xsl:otherwise><xsl:value-of select="@constant"/></xsl:otherwise>
-                </xsl:choose>
-            </xsl:variable>
+            <xsl:variable name="unit-const" select="if (@constant = '' or @constant = 'none') then 'none' else @constant"/>
             <list begin="" indent="    " end="">
-                @property #read-only
-            </list>
-            <list begin="" indent="    " end="">
-                def <xsl:value-of select="@name"/>(self):
-            </list>
-            <list begin="" indent="        " end="">
-                return <xsl:value-of select="@type"/>.<xsl:value-of select="$unitConstant"/>
+                <item>@property  # read-only</item>
+                <item>def <xsl:value-of select="@name"/>(self):</item>
+                <list begin="" indent="    " end="">
+                    <item>return <xsl:value-of select="@type"/>.<xsl:value-of select="$unit-const"/></item>
+                </list>
             </list>
         </xsl:for-each>
         
-        <!-- Add __init__ method with unit symbol as default -->
-        <xsl:variable name="unitConstant">
-            <xsl:choose>
-                <xsl:when test="a:Enumerated[@name='unit']/@constant = '' or a:Enumerated[@name='unit']/@constant = 'none'">none</xsl:when>
-                <xsl:otherwise><xsl:value-of select="a:Enumerated[@name='unit']/@constant"/></xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
+        <!-- Add __init__ method -->
+        <xsl:variable name="unit-const" select="if (a:Enumerated[@name='unit']/@constant = '' or a:Enumerated[@name='unit']/@constant = 'none') then 'none' else a:Enumerated[@name='unit']/@constant"/>
         <list begin="" indent="    " end="">
-            def __init__(self, value, input_unit:str='<xsl:value-of select="$unitConstant"/>', input_multiplier:str=None):
-        </list>
-        <list begin="" indent="        " end="">
-            self.__pint__(value = value, input_unit=input_unit, input_multiplier=input_multiplier)
+            <item>def __init__(self, value, input_unit: str='<xsl:value-of select="$unit-const"/>', input_multiplier: str=None):</item>
+            <list begin="" indent="    " end="">
+                <item>self.__pint__(value=value, input_unit=input_unit, input_multiplier=input_multiplier)</item>
+            </list>
         </list>
         
-        <item></item>
-    </xsl:template>
-    
-    <!-- Template for wrapping comment text -->
-    <xsl:template name="comment">
-        <wrap width="70">
-            <xsl:value-of select="."/>
-        </wrap>
-    </xsl:template>
-    
-    <!-- Template for attribute metadata -->
-    <xsl:template name="attr_metadata">
-        <!-- Use stereotype label if provided, otherwise, use 'Attribute' -->
-        <xsl:if test="a:Stereotype/@label">
-            <item> 'type': '<xsl:value-of select="a:Stereotype/@label"/>', </item>
-        </xsl:if>
-        <xsl:if test="not(a:Stereotype/@label)">
-            <item> 'type': 'Attribute', </item>
-        </xsl:if>
-        <item> 'minOccurs': '<xsl:value-of select="@minOccurs"/>', </item>
-        <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item>
-        <item> 'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#' </item>
-        
-        <!-- Uncomment lines below to include docstring in attribute metadata -->
-        <!-- <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item> -->
-        <!-- <item> 'docstring': </item> -->
-        <!-- <list begin="    '''" indent="    " end="    '''"> -->
-        <!-- <xsl:for-each select="a:Comment"> -->
-        <!-- <xsl:call-template name="comment"/> -->
-        <!-- </xsl:for-each> -->
-        <!-- </list> -->
+        <item/>
     </xsl:template>
-    
-    <!-- Template for association metadata -->
-    <xsl:template name="assc_metadata">
-        <!-- Use stereotype label if provided, otherwise, use 'Association' -->
-        <xsl:if test="a:Stereotype/@label">
-            <item> 'type': '<xsl:value-of select="a:Stereotype/@label"/>', </item>
-        </xsl:if>
-        <xsl:if test="not(a:Stereotype/@label)">
-            <item> 'type': 'Association', </item>
-        </xsl:if>
-        <item> 'minOccurs': '<xsl:value-of select="@minOccurs"/>', </item>
-        <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item>
-        <item> 'inverse': '<xsl:value-of select="substring-after(@inverseBaseProperty,'#')"/>', </item>
-        <item> 'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#' </item>
-        
-        <!-- Uncomment lines below to include docstring in association metadata -->
-        <!-- <item> 'inverse': '<xsl:value-of select="substring-after(@inverseBaseProperty,'#')"/>', </item> -->
-        <!-- <item> 'docstring': </item> -->
-        <!-- <list begin="    '''" indent="    " end="    '''"> -->
-        <!-- <xsl:for-each select="a:Comment"> -->
-        <!-- <xsl:call-template name="comment"/> -->
-        <!-- </xsl:for-each> -->
-        <!-- </list> -->
+
+    <!-- Generate attribute metadata -->
+    <xsl:template name="generate-attribute-metadata">
+        <item>'type': '<xsl:value-of select="if (a:Stereotype/@label) then a:Stereotype/@label else 'Attribute'"/>',</item>
+        <item>'minOccurs': '<xsl:value-of select="(@minOccurs, '0')[1]"/>',</item>
+        <item>'maxOccurs': '<xsl:value-of select="(@maxOccurs, '1')[1]"/>',</item>
+        <item>'namespace': '<xsl:value-of select="substring-before((@baseProperty, '#')[1],'#')"/>#'</item>
     </xsl:template>
-    
-    <!-- Template for attribute metadata -->
-    <xsl:template name="primitive_metadata">
-        <!-- Use stereotype label if provided, otherwise, use 'Attribute' -->
-        <xsl:if test="a:Stereotype/@label">
-            <item> 'type': '<xsl:value-of select="a:Stereotype/@label"/>', </item>
-        </xsl:if>
-        <xsl:if test="not(a:Stereotype/@label)">
-            <item> 'type': 'Attribute', </item>
-        </xsl:if>
-        <item> 'minOccurs': '<xsl:value-of select="@minOccurs"/>', </item>
-        <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item>
-        <item> 'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#' </item>
-        
-        <!-- Uncomment lines below to include docstring in attribute metadata -->
-        <!-- <item> 'maxOccurs': '<xsl:value-of select="@maxOccurs"/>', </item> -->
-        <!-- <item> 'docstring': </item> -->
-        <!-- <list begin="    '''" indent="    " end="    '''"> -->
-        <!-- <xsl:for-each select="a:Comment"> -->
-        <!-- <xsl:call-template name="comment"/> -->
-        <!-- </xsl:for-each> -->
-        <!-- </list> -->
+
+    <!-- Generate association metadata -->
+    <xsl:template name="generate-association-metadata">
+        <item>'type': '<xsl:value-of select="if (a:Stereotype/@label) then a:Stereotype/@label else 'Association'"/>',</item>
+        <item>'minOccurs': '<xsl:value-of select="(@minOccurs, '0')[1]"/>',</item>
+        <item>'maxOccurs': '<xsl:value-of select="(@maxOccurs, '1')[1]"/>',</item>
+        <item>'inverse': '<xsl:value-of select="substring-after((@inverseBaseProperty, '#')[1],'#')"/>',</item>
+        <item>'namespace': '<xsl:value-of select="substring-before((@baseProperty, '#')[1],'#')"/>#'</item>
     </xsl:template>
-    
-    <!-- Template for enumeration values -->
-    <xsl:template name="enumvalue">
-        <!-- Error handling for invalid or missing names -->
-        <xsl:variable name="name">
-            <xsl:call-template name="name">
-                <xsl:with-param name="name" select="@name"/>
-                <xsl:with-param name="type" select="@name"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <item>
-            <xsl:value-of select="$name"/> = '<xsl:value-of select="$name"/>'
-        </item>
-        <!-- Parse all comment text, merge multiple comments into single block -->
-        <list begin="'''" indent="" end="'''">
-            <xsl:for-each select="a:Comment">
-                <xsl:call-template name="comment"/>
-            </xsl:for-each>
-        </list>
-        <item></item>
-        
+
+    <!-- Generate inverse association metadata -->
+    <xsl:template name="generate-inverse-association-metadata">
+        <item>'type': '<xsl:value-of select="if (a:Stereotype/@label) then a:Stereotype/@label else 'Association'"/>',</item>
+        <item>'minOccurs': '<xsl:value-of select="(@minOccurs, '0')[1]"/>',</item>
+        <item>'maxOccurs': '<xsl:value-of select="(@maxOccurs, '1')[1]"/>',</item>
+        <item>'inverse': '<xsl:value-of select="substring-after(@inverseBaseProperty, '#')"/>',</item>
+        <item>'namespace': '<xsl:value-of select="substring-before(@baseProperty,'#')"/>#'</item>
     </xsl:template>
-    
-    <!-- Template for converting primitives to python spelling -->
-    <xsl:template name="type">
-        <xsl:param name="xstype" select="@xstype"/>
+
+    <!-- Function to get Python type mapping using explicit choose/when -->
+    <xsl:function name="local:get-python-type" as="xs:string">
+        <xsl:param name="xstype" as="xs:string?"/>
         <xsl:choose>
-            <xsl:when test="$xstype = 'string' or @xstype = 'String'">str</xsl:when>
-            <xsl:when test="$xstype = 'integer' or @xstype = 'Integer' or @xstype = 'int'">int</xsl:when>
-            <xsl:when test="$xstype = 'float' or @xstype = 'Float'">float</xsl:when>
-            <xsl:when test="$xstype = 'double' or @xstype = 'Double'">float</xsl:when>
-            <xsl:when test="$xstype = 'boolean' or @xstype = 'Boolean'">bool</xsl:when>
+            <xsl:when test="not($xstype) or string-length($xstype) = 0">str</xsl:when>
+            <xsl:when test="$xstype = 'string' or $xstype = 'String'">str</xsl:when>
+            <xsl:when test="$xstype = 'integer' or $xstype = 'Integer' or $xstype = 'int'">int</xsl:when>
+            <xsl:when test="$xstype = 'float' or $xstype = 'Float'">float</xsl:when>
+            <xsl:when test="$xstype = 'double' or $xstype = 'Double'">float</xsl:when>
+            <xsl:when test="$xstype = 'boolean' or $xstype = 'Boolean'">bool</xsl:when>
             <xsl:otherwise>str</xsl:otherwise>
         </xsl:choose>
-    </xsl:template>
-    
-    <!-- Template for error handling of missing or reserved names -->
-    <xsl:template name="name">
-        <xsl:param name="name" select="@name"/>
-        <xsl:param name="type" select="@type"/>
+    </xsl:function>
+
+    <!-- Function to sanitize names with proper null handling -->
+    <xsl:function name="local:sanitize-name" as="xs:string">
+        <xsl:param name="name" as="xs:string"/>
+        <xsl:param name="type" as="xs:string"/>
         
-        <xsl:variable name="cleanName">
-            <xsl:call-template name="removeSpecialChars">
-                <xsl:with-param name="text" select="$name"/>
-            </xsl:call-template>
-        </xsl:variable>
+        <!-- Handle EAID_ prefixed names -->
+        <xsl:variable name="clean-name" select="
+            if (contains($name, 'EAID_')) then $type 
+            else replace($name, '[^a-zA-Z0-9_]', '')"/>
         
-        <xsl:choose>
-            <xsl:when test="contains($name,'EAID_')"><xsl:value-of select="$type"/></xsl:when>
-            <xsl:when test="string-length($cleanName) > 0 and translate(substring($cleanName,1,1),'0123456789','') = ''">_<xsl:value-of select="$cleanName"/></xsl:when>
-            <xsl:when test="$cleanName = 'and'">_and</xsl:when>
-            <xsl:when test="$cleanName = 'as'">_as</xsl:when>
-            <xsl:when test="$cleanName = 'assert'">_assert</xsl:when>
-            <xsl:when test="$cleanName = 'break'">_break</xsl:when>
-            <xsl:when test="$cleanName = 'class'">_class</xsl:when>
-            <xsl:when test="$cleanName = 'continue'">_continue</xsl:when>
-            <xsl:when test="$cleanName = 'def'">_def</xsl:when>
-            <xsl:when test="$cleanName = 'del'">_del</xsl:when>
-            <xsl:when test="$cleanName = 'elif'">_elif</xsl:when>
-            <xsl:when test="$cleanName = 'else'">_else</xsl:when>
-            <xsl:when test="$cleanName = 'except'">_except</xsl:when>
-            <xsl:when test="$cleanName = 'finally'">_finally</xsl:when>
-            <xsl:when test="$cleanName = 'for'">_for</xsl:when>
-            <xsl:when test="$cleanName = 'from'">_from</xsl:when>
-            <xsl:when test="$cleanName = 'global'">_global</xsl:when>
-            <xsl:when test="$cleanName = 'if'">_if</xsl:when>
-            <xsl:when test="$cleanName = 'import'">_import</xsl:when>
-            <xsl:when test="$cleanName = 'in'">_in</xsl:when>
-            <xsl:when test="$cleanName = 'is'">_is</xsl:when>
-            <xsl:when test="$cleanName = 'lambda'">_lambda</xsl:when>
-            <xsl:when test="$cleanName = 'nonlocal'">_nonlocal</xsl:when>
-            <xsl:when test="$cleanName = 'not'">_not</xsl:when>
-            <xsl:when test="$cleanName = 'or'">_or</xsl:when>
-            <xsl:when test="$cleanName = 'pass'">_pass</xsl:when>
-            <xsl:when test="$cleanName = 'raise'">_raise</xsl:when>
-            <xsl:when test="$cleanName = 'return'">_return</xsl:when>
-            <xsl:when test="$cleanName = 'try'">_try</xsl:when>
-            <xsl:when test="$cleanName = 'while'">_while</xsl:when>
-            <xsl:when test="$cleanName = 'with'">_with</xsl:when>
-            <xsl:when test="$cleanName = 'yield'">_yield</xsl:when>
-            <xsl:otherwise><xsl:value-of select="$cleanName"/></xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    
-    <xsl:template name="removeSpecialChars">
-        <xsl:param name="text"/>
-        <xsl:param name="pos" select="1"/>
-        <xsl:param name="result" select="''"/>
+        <!-- Handle empty names -->
+        <xsl:variable name="safe-name" select="
+            if (string-length($clean-name) = 0) then 'unnamed'
+            else $clean-name"/>
         
-        <xsl:choose>
-            <xsl:when test="$pos > string-length($text)">
-                <xsl:value-of select="$result"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:variable name="char" select="substring($text, $pos, 1)"/>
-                <xsl:variable name="validChars" select="'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'"/>
-                <xsl:variable name="isValidChar" select="contains($validChars, $char)"/>
-                
-                <xsl:call-template name="removeSpecialChars">
-                    <xsl:with-param name="text" select="$text"/>
-                    <xsl:with-param name="pos" select="$pos + 1"/>
-                    <xsl:with-param name="result">
-                        <xsl:choose>
-                            <xsl:when test="$isValidChar">
-                                <xsl:value-of select="concat($result, $char)"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:value-of select="$result"/>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:with-param>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-</xsl:stylesheet>
-
-<!-- <list begin="" indent="    " end=""> -->
-<!-- <item> </item> -->
-<!-- </list> -->
+        <!-- Handle names starting with digits -->
+        <xsl:variable name="prefixed-name" select="
+            if (matches($safe-name, '^[0-9]')) then concat('_', $safe-name)
+            else $safe-name"/>
+        
+        <!-- Handle Python keywords -->
+        <xsl:sequence select="
+            if ($prefixed-name = $python-keywords) then concat('_', $prefixed-name)
+            else $prefixed-name"/>
+    </xsl:function>
+</xsl:stylesheet>
\ No newline at end of file