thegridelectric · jessicamillar · Jul 2, 2024 · Jul 2, 2024
diff --git a/CodeGenerationTools/GridworksCore/Enum/DeriveEnums.xslt b/CodeGenerationTools/GridworksCore/Enum/DeriveEnums.xslt
@@ -19,7 +19,7 @@
  <xsl:template match="/">
  <FileSet>
  <FileSetFiles>
- <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto') and not (NoVersions = 'true')]">
+ <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks') and not (NoVersions = 'true')]">
  <xsl:variable name="enum-id" select="GtEnumId"/>
  <xsl:variable name="enum-version" select="EnumVersion"/>
  <xsl:variable name="enum-name" select="EnumName"/>
@@ -32,7 +32,7 @@
  </xsl:call-template>
  </xsl:variable>
  <FileSetFile>
- <xsl:element name="RelativePath"><xsl:text>../../../src/gwproto/enums/</xsl:text>
+ <xsl:element name="RelativePath"><xsl:text>../../../src/gw/enums/</xsl:text>
  <xsl:value-of select="translate(LocalName,'.','_')"/><xsl:text>.py</xsl:text></xsl:element>
 
  <OverwriteMode>Always</OverwriteMode>
@@ -43,7 +43,7 @@
 from typing import List
 from typing import Optional
 
-from gridworks.enums import GwStrEnum
+from gw.enums import GwStrEnum
 
 
 class </xsl:text><xsl:value-of select="$enum-class-name"/>
@@ -63,8 +63,7 @@ class </xsl:text><xsl:value-of select="$enum-class-name"/>
  Enum </xsl:text><xsl:value-of select="Name"/><xsl:text> version </xsl:text><xsl:value-of select="$enum-version"/>
  <xsl:text> in the GridWorks Type registry.
 
- Used by used by multiple Application Shared Languages (ASLs), including but not limited to
- gwproto. For more information:
+ Used by used by multiple Application Shared Languages (ASLs). For more information:
  - [ASLs](https://gridworks-type-registry.readthedocs.io/en/latest/)
  - [Global Authority](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#</xsl:text>
  <xsl:value-of select="translate($enum-name,'.','')"/>

diff --git a/CodeGenerationTools/GridworksCore/Enum/Docs/DeriveAslDocs.xslt b/CodeGenerationTools/GridworksCore/Enum/Docs/DeriveAslDocs.xslt
@@ -19,7 +19,7 @@
  <xsl:template match="/">
  <FileSet>
  <FileSetFiles>
- <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto')]">
+ <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks')]">
  <xsl:variable name="versioned-enum-id" select="VersionedEnum"/>
  <xsl:for-each select="$airtable//VersionedEnums/VersionedEnum[(VersionedEnumId = $versioned-enum-id) and (Status = 'Active' or Status = 'Pending')]">
  <xsl:variable name="enum-name" select="EnumName"/>

diff --git a/CodeGenerationTools/GridworksCore/Enum/Docs/Toc/DeriveToc.xslt b/CodeGenerationTools/GridworksCore/Enum/Docs/Toc/DeriveToc.xslt
@@ -29,7 +29,7 @@ Enum Application Shared Language (ASL) Specifications
 ===============
 
 </xsl:text>
-<xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto')]">
+<xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks')]">
 <xsl:sort select="VersionedTypeName" data-type="text"/>
 <xsl:variable name="versioned-enum-id" select="VersionedEnum"/>
 <xsl:for-each select="$airtable//VersionedEnums/VersionedEnum[(VersionedEnumId = $versioned-enum-id) and (Status = 'Active' or Status = 'Pending')]">

diff --git a/CodeGenerationTools/GridworksCore/Enum/EnumInit/DeriveEnumInit.xslt b/CodeGenerationTools/GridworksCore/Enum/EnumInit/DeriveEnumInit.xslt
@@ -20,12 +20,12 @@
  <FileSet>
 
  <FileSetFile>
- <xsl:element name="RelativePath"><xsl:text>../../../../src/gwproto/enums/__init__.py</xsl:text></xsl:element>
+ <xsl:element name="RelativePath"><xsl:text>../../../../src/gw/enums/__init__.py</xsl:text></xsl:element>
 
  <OverwriteMode>Always</OverwriteMode>
  <xsl:element name="FileContents">
 <xsl:text>"""
-GridWorks Enums used in gwproto, the Application Shared Language (ASL) used by SCADA
+GridWorks Enums used in gw, the Application Shared Language (ASL) used by SCADA
 devices and AtomicTNodes to communicate with each other. These enums play a specific structural
 role as semantic "glue" within ASLs.
 
@@ -56,11 +56,13 @@ on these ideas:
  - [ASLs](https://gridwork-type-registry.readthedocs.io/en/latest/asls.html)
 
 
- """</xsl:text>
-<xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto') and not(normalize-space(EnumName)='')]">
+ """
+
+from gw.enums.gw_str_enum import GwStrEnum</xsl:text>
+<xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks') and not(normalize-space(EnumName)='')]">
 <xsl:sort select="LocalEnumName" data-type="text"/>
 <xsl:text>
-from gwproto.enums.</xsl:text>
+from gw.enums.</xsl:text>
 <xsl:value-of select="translate(LocalEnumName,'.','_')"/>
 <xsl:text> import </xsl:text>
 <xsl:call-template name="nt-case">
@@ -72,8 +74,9 @@ from gwproto.enums.</xsl:text>
 <xsl:text>
 
 
-__all__ = [</xsl:text>
-<xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto')]">
+__all__ = [
+ "GwStrEnum",</xsl:text>
+<xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks')]">
 <xsl:sort select="LocalEnumName" data-type="text"/>
 <xsl:variable name="gt-enum-id" select="GtEnumId"/>
 

diff --git a/CodeGenerationTools/GridworksCore/Enum/EnumTest/DeriveEnumTests.xslt b/CodeGenerationTools/GridworksCore/Enum/EnumTest/DeriveEnumTests.xslt
@@ -19,7 +19,7 @@
  <xsl:template match="/">
  <FileSet>
  <FileSetFiles>
- <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto')]">
+ <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks')]">
  <xsl:variable name="enum-id" select="GtEnumId"/>
  <xsl:variable name="version" select="EnumVersion"/>
  <xsl:variable name="enum-name" select="EnumName"/>
@@ -43,7 +43,7 @@ Tests for enum </xsl:text><xsl:value-of select="Name"/><xsl:text>.</xsl:text><xs
  <xsl:text> from the GridWorks Type Registry.
 """
 
-from gwproto.enums import </xsl:text><xsl:value-of select="$local-class-name"/><xsl:text>
+from gw.enums import </xsl:text><xsl:value-of select="$local-class-name"/><xsl:text>
 
 
 def test_</xsl:text> <xsl:value-of select="translate(LocalName,'.','_')"/>
@@ -70,7 +70,7 @@ def test_</xsl:text> <xsl:value-of select="translate(LocalName,'.','_')"/>
  <xsl:text>",</xsl:text>
  </xsl:otherwise>
  </xsl:choose>
- 
+
  </xsl:for-each>
  <xsl:text>
  }
@@ -96,7 +96,7 @@ def test_</xsl:text> <xsl:value-of select="translate(LocalName,'.','_')"/>
  <xsl:value-of select="$version"/>
  <xsl:text>"
 </xsl:text>
- 
+
 
  <xsl:for-each select="$airtable//EnumSymbols/EnumSymbol[(Enum = $enum-id) and (Version &lt;= $version)]">
  <xsl:sort select="Idx" data-type="number"/>
@@ -117,7 +117,7 @@ def test_</xsl:text> <xsl:value-of select="translate(LocalName,'.','_')"/>
  for value in </xsl:text><xsl:value-of select="$local-class-name"/><xsl:text>.values():
  symbol = </xsl:text><xsl:value-of select="$local-class-name"/><xsl:text>.value_to_symbol(value)
  assert </xsl:text><xsl:value-of select="$local-class-name"/><xsl:text>.symbol_to_value(symbol) == value</xsl:text>
- 
+
  </xsl:if>
 
  <!-- Add newline at EOF for git and pre-commit-->

diff --git a/CodeGenerationTools/GridworksCore/Enum/Literal/DeriveLiteral.xslt b/CodeGenerationTools/GridworksCore/Enum/Literal/DeriveLiteral.xslt
@@ -19,7 +19,7 @@
  <xsl:template match="/">
  <FileSet>
  <FileSetFiles>
- <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto') and (EnumType = 'Literal')]">
+ <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks') and (EnumType = 'Literal')]">
  <xsl:variable name="enum-id" select="GtEnumId"/>
  <xsl:variable name="enum-version" select="EnumVersion"/>
  <xsl:variable name="enum-name" select="EnumName"/>
@@ -31,15 +31,15 @@
  </xsl:call-template>
  </xsl:variable>
  <FileSetFile>
- <xsl:element name="RelativePath"><xsl:text>../../../../src/gwproto/enums/</xsl:text>
+ <xsl:element name="RelativePath"><xsl:text>../../../../src/gw/enums/</xsl:text>
  <xsl:value-of select="translate(LocalName,'.','_')"/><xsl:text>.py</xsl:text></xsl:element>
 
  <OverwriteMode>Always</OverwriteMode>
  <xsl:element name="FileContents">
 
 
 <xsl:text>
-# Literal Enum: 
+# Literal Enum:
 # - no additional values can be added over time.
 # - Sent as-is, not in hex symbol
 from enum import auto

diff --git a/CodeGenerationTools/GridworksCore/Enum/OldSchool/DeriveOldSchool.xslt b/CodeGenerationTools/GridworksCore/Enum/OldSchool/DeriveOldSchool.xslt
@@ -19,7 +19,7 @@
  <xsl:template match="/">
  <FileSet>
  <FileSetFiles>
- <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gwproto') and (EnumType = 'OldSchool')]">
+ <xsl:for-each select="$airtable//ProtocolEnums/ProtocolEnum[(normalize-space(ProtocolName) ='gridworks') and (EnumType = 'OldSchool')]">
  <xsl:variable name="enum-id" select="GtEnumId"/>
  <xsl:variable name="enum-version" select="EnumVersion"/>
  <xsl:variable name="enum-name" select="EnumName"/>
@@ -31,7 +31,7 @@
  </xsl:call-template>
  </xsl:variable>
  <FileSetFile>
- <xsl:element name="RelativePath"><xsl:text>../../../../src/gwproto/enums/</xsl:text>
+ <xsl:element name="RelativePath"><xsl:text>../../../../src/gw/enums/</xsl:text>
  <xsl:value-of select="translate(LocalName,'.','_')"/><xsl:text>.py</xsl:text></xsl:element>
 
  <OverwriteMode>Always</OverwriteMode>
@@ -65,7 +65,7 @@ class </xsl:text><xsl:value-of select="$enum-class-name"/>
 
 <xsl:value-of select="LocalValue"/>
 
-<xsl:text> = </xsl:text><xsl:value-of select="Symbol"/> 
+<xsl:text> = </xsl:text><xsl:value-of select="Symbol"/>
 
 
 </xsl:for-each>

diff --git a/CodeGenerationTools/GridworksCore/GnfCommon.xslt b/CodeGenerationTools/GridworksCore/GnfCommon.xslt
@@ -53,6 +53,16 @@
 </xsl:template>
 
 
+<xsl:template name="insert-spaces">
+ <xsl:param name="count" select="4"/>
+ <xsl:if test="$count > 0">
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="insert-spaces">
+ <xsl:with-param name="count" select="$count - 1"/>
+ </xsl:call-template>
+ </xsl:if>
+</xsl:template>
+
 <xsl:template name="message-case">
  <xsl:param name="type-name-text" select="''"></xsl:param>
  <xsl:param name="is_first" select="'true'"></xsl:param>

diff --git a/CodeGenerationTools/GridworksCore/ODXML/DataSchema.odxml b/CodeGenerationTools/GridworksCore/ODXML/DataSchema.odxml