ToString + FromString functions

data.proto

@@ -20,7 +20,7 @@ import "schema.proto";
 
 package data;
 
-option go_package = "github.com/sdcio/sdc-protos/sdcpb;schema_server";
+option go_package = "github.com/sdcio/sdc-protos/sdcpb;sdcpb";
 
 service DataServer {
   // datastore

go.mod

@@ -1,13 +1,15 @@
 module github.com/sdcio/sdc-protos
 
-go 1.23.9
+go 1.24.0
 
 require (
+	github.com/sdcio/logger v0.0.3
 	google.golang.org/grpc v1.75.1
 	google.golang.org/protobuf v1.36.9
 )
 
 require (
+	github.com/go-logr/logr v1.4.3 // indirect
 	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.26.0 // indirect

go.sum

@@ -8,6 +8,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/sdcio/logger v0.0.3 h1:IFUbObObGry+S8lHGwOQKKRxJSuOphgRU/hxVhOdMOM=
+github.com/sdcio/logger v0.0.3/go.mod h1:yWaOxK/G6vszjg8tKZiMqiEjlZouHsjFME4zSk+SAEA=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=

schema.proto

@@ -16,7 +16,7 @@ syntax = "proto3";
 
 package schema;
 
-option go_package = "github.com/sdcio/sdc-protos/sdcpb;schema_server";
+option go_package = "github.com/sdcio/sdc-protos/sdcpb;sdcpb";
 
 service SchemaServer {
   // returns schema name, vendor, version, and files path(s)

sdcpb/blame_tree_element_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import (
 	"fmt"

sdcpb/choice_info_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 func (c *ChoiceInfo) GetChoiceByName(choiceName string) *ChoiceInfoChoice {
 	return c.Choice[choiceName]

sdcpb/choice_info_choice_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 func (c *ChoiceInfoChoice) GetAllAttributes() []string {
 	result := make([]string, 0, len(c.Case))

sdcpb/container_schema_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 func (x *ContainerSchema) GetMandatoryChildrenConfig() []*MandatoryChild {
 	var result []*MandatoryChild

sdcpb/identityref_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import "fmt"
 

sdcpb/path_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import (
 	"errors"

sdcpb/path_additions_test.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import (
 	"testing"

sdcpb/path_elem.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import (
 	"iter"

sdcpb/path_set.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import "iter"
 

sdcpb/path_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package schema_server
+package sdcpb
 
 import (
 	"testing"

sdcpb/paths.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 type Paths []*Path
 

sdcpb/schema_elem_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 func (s *SchemaElem) IsState() bool {
 	switch x := s.Schema.(type) {

sdcpb/transaction_set_response_intent_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 func (t *TransactionSetResponseIntent) Failed() bool {
 	return len(t.Errors) > 0

sdcpb/transactionsetresponse_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import "fmt"
 

sdcpb/typed_value_additions.go

@@ -1,4 +1,4 @@
-package schema_server
+package sdcpb
 
 import (
 	"bytes"
@@ -117,9 +117,6 @@ func toStringSorted(tvs []*TypedValue) []string {
 
 // ToString converts the TypedValue to the real, non proto string
 func (tv *TypedValue) ToString() string {
-	if tv == nil {
-		return ""
-	}
 	switch tv.Value.(type) {
 	case *TypedValue_AnyVal:
 		return string(tv.GetAnyVal().GetValue()) // questionable...
@@ -180,3 +177,54 @@ func (tv *TypedValue) ToString() string {
 	}
 	return ""
 }
+
+//TODO: Still needed?
+func ConvertToTypedValue(schemaObject *SchemaElem, v string, ts uint64) (*TypedValue, error) {
+	var schemaType *SchemaLeafType
+	switch {
+	case schemaObject.GetField() != nil:
+		schemaType = schemaObject.GetField().GetType()
+	case schemaObject.GetLeaflist() != nil:
+		schemaType = schemaObject.GetLeaflist().GetType()
+	case schemaObject.GetContainer() != nil:
+		if !schemaObject.GetContainer().IsPresence {
+			return nil, fmt.Errorf("non presence container update")
+		}
+		return nil, nil
+	}
+	return TVFromString(schemaType, v, ts)
+}
+
+func (tv *TypedValue) ToYANGType(schemaObject *SchemaElem) (*TypedValue, error) {
+	switch tv.Value.(type) {
+	case *TypedValue_AsciiVal:
+		return ConvertToTypedValue(schemaObject, tv.GetAsciiVal(), tv.GetTimestamp())
+	case *TypedValue_BoolVal:
+		return tv, nil
+	case *TypedValue_BytesVal:
+		return tv, nil
+	case *TypedValue_DecimalVal:
+		return tv, nil
+	case *TypedValue_FloatVal:
+		return tv, nil
+	case *TypedValue_DoubleVal:
+		return tv, nil
+	case *TypedValue_IntVal:
+		return tv, nil
+	case *TypedValue_StringVal:
+		return ConvertToTypedValue(schemaObject, tv.GetStringVal(), tv.GetTimestamp())
+	case *TypedValue_UintVal:
+		return tv, nil
+	case *TypedValue_JsonIetfVal: // TODO:
+	case *TypedValue_JsonVal: // TODO:
+	case *TypedValue_LeaflistVal:
+		return tv, nil
+	case *TypedValue_ProtoBytes:
+		return tv, nil
+	case *TypedValue_AnyVal:
+		return tv, nil
+	case *TypedValue_IdentityrefVal:
+		return ConvertToTypedValue(schemaObject, tv.GetStringVal(), tv.GetTimestamp())
+	}
+	return tv, nil
+}