Use pickle for variable serialization

Author: eduard93

isc/py/data/Varable.cls

@@ -8,9 +8,12 @@ Property Name As %String;
 /// Variable Class
 Property Type As %String;
 
-/// Variable repr
+/// Variable repr serialization
 Property Value As %VarString;
 
+/// Variable pickle serialization
+Property Pickle As %VarString;
+
 /// Variable JSON serialization
 Property JSON As %VarString;
 
@@ -25,22 +28,24 @@ ClassMethod SaveVariable(name As %String = "", Output variable As isc.py.data.Va
 	quit:repr="" $$$ERROR($$$GeneralError, $$$FormatText("Variable %1 is empty or initialized", name))
 
 	set type = ##class(isc.py.Callout).SimpleString("zzztype=type("_name_").__name__", "zzztype")
-	do ##class(isc.py.Callout).SimpleString("import json;")
+	do ##class(isc.py.Callout).SimpleString("import json, pickle;")
+	
 	if type = "DataFrame" {
-		//set json = ##class(isc.py.Callout).SimpleString("zzzjson=json.dumps([list("_name_".index), list("_name_"), "_name_".values.tolist()])", "zzzjson")
 		set json = ##class(isc.py.Callout).SimpleString("zzzjson=" _name _ ".to_json()", "zzzjson")
-		set repr =  ##class(isc.py.Callout).SimpleString("zzzjson=" _name _ ".to_dict()", "zzzjson")
 	} else {
 		set json = ##class(isc.py.Callout).SimpleString("zzzjson=json.dumps(" _name _ ")", "zzzjson")
 	}
 
+	set pickle = ##class(isc.py.Callout).SimpleString("zzzjson=pickle.dumps(" _name _ ")", "zzzjson")
+	
 
 	do ##class(isc.py.Callout).SimpleString("del zzztype, zzzjson")
 
 	set variable = ..%New()
 	set variable.Name = name
 	set variable.Value = repr
 	set variable.Type = type
+	set variable.Pickle = pickle
 	set variable.JSON = json
 	set sc = variable.%Save()
 
@@ -56,20 +61,15 @@ Method Display(indent As %String = "")
 	If $l(..Value)<=limit {
 		Write indent, "Value: ", ..Value, !
 	} Else {
-		Write indent, "Value (truncated): ", $e(..Value,1,limit), !
+		Write indent, "Value (truncated): ", $replace($e(..Value,1,limit),$c(10), $c(13,10)), !
 	}
 	write !
 }
 
 /// Restore variable for disk.
 Method Restore(context As isc.py.data.Context)
 {
-	if ..Type = "DataFrame" {
-		set pandas = context.Modules.GetAt("pandas")
-		do ##class(isc.py.Callout).SimpleString(..Name _ "=" _ pandas _".DataFrame.from_dict(" _ ..Value _ ")")
-	} else {
-		do ##class(isc.py.Callout).SimpleString(..Name _ "=" _ ..Value)
-	}
+	do ##class(isc.py.Callout).SimpleString(..Name _ "=pickle.loads(" _ ..Pickle _ ")")
 }
 
 Storage Default
@@ -90,6 +90,9 @@ Storage Default
 <Value name="5">
 <Value>JSON</Value>
 </Value>
+<Value name="6">
+<Value>Pickle</Value>
+</Value>
 </Data>
 <DataLocation>^isc.py.data.VarableD</DataLocation>
 <DefaultData>VarableDefaultData</DefaultData>