upgrade

compo-singleone-v2-dev-acc.py

@@ -93,7 +93,7 @@ else:
 #######################################################
 
 def get_model_simplified_name_from_dirname(dirname):
-    return dirname.replace("model_","").replace("_864x","").replace("_864","").replace("_new","")
+    return dirname.replace("model_","").replace("_864x","").replace("_864","").replace("_new","").replace("-864","")
 
 def get_padded_checkpoint_no_from_filename(checkpoint_filename):
     match = re.search(r'ckpt-(\d+)', checkpoint_filename)
@@ -107,7 +107,7 @@ def get_padded_checkpoint_no_from_filename(checkpoint_filename):
 
 found_model='none'
 found_model_checkpoint='0'
-checkpoint_info='0'
+
 #########################################################
 # SETUP
 
@@ -115,7 +115,7 @@ checkpoint_info='0'
 runway_files = runway.file(is_directory=True)
 @runway.setup(options={'styleCheckpoint': runway_files})
 def setup(opts):
-    global found_model,found_model_checkpoint,checkpoint_info
+    global found_model,found_model_checkpoint
     sess = tf.Session()
     # sess2 = tf.Session()
     # sess3 = tf.Session()
@@ -186,7 +186,7 @@ def setup(opts):
     #ckpt2 = tf.train.get_checkpoint_state(checkpoint2_dir)
     # ckpt3 = tf.train.get_checkpoint_state(checkpoint3_dir)
     ckpt_name = os.path.basename(ckpt.model_checkpoint_path)
-    checkpoint_info = ckpt_name
+    
     found_model_checkpoint= get_padded_checkpoint_no_from_filename(ckpt_name)
     
     #ckpt2_name = os.path.basename(ckpt2.model_checkpoint_path)
@@ -203,30 +203,36 @@ def setup(opts):
     # models.m3 = m3
     return models
 
-meta_inputs={'meta':text}
-meta_outputs={'meta':text,'model':text,'files':text,'checkpoint':text}
-
-@runway.command('meta2', inputs=meta_inputs, outputs=meta_outputs)
-def get_geta(models, inp):
-    global found_model,found_model_checkpoint,checkpoint_info
+def _make_meta_as_json(inp):
+    global found_model,found_model_checkpoint
     meta_value = inp['meta']
-    #convert RUNWAY_FILES to string
     json_return = {
-        "meta": "PROTO3 " + meta_value,
+        "meta": meta_value,
         "model": found_model,
-        "files": str(runway_files),
         "checkpoint": found_model_checkpoint
     }
+    return json_return
+
+
+meta_inputs={'meta':text}
+meta_outputs={'meta':text,'model':text,'files':text,'checkpoint':text}
+
+@runway.command('meta2', inputs=meta_inputs, outputs=meta_outputs)
+def get_geta(models, inp):
+    global found_model,found_model_checkpoint
+    
+    json_return = _make_meta_as_json(inp)
         # "files": "nothing yet"
     print(json_return)
-    return json_return #'{"meta":"PROTO","files":'+str(RUNWAY_FILES)+'}'
+    return json_return 
+
 
 
 
 
 #@STCGoal add number or text to specify resolution of the three pass
 inputs={'contentImage': runway.image,'x1':number(default=1024,min=24,max=17000),'x2':number(default=0,min=-99,max=99)}
-outputs={'stylizedImage': runway.image,'totaltime':number,'x1': number,'c1':number,'model1name':text}
+outputs={'stylizedImage': runway.image,'totaltime':number,'x1': number,'c1':number,'model1name':text,'meta':text}
 
 @runway.command('stylize', inputs=inputs, outputs=outputs)
 def stylize(models, inp):
@@ -342,7 +348,8 @@ def stylize(models, inp):
     stop = time.time()
     totaltime = stop - start
     print("The time of the run:", totaltime)
-    res2 = dict(stylizedImage=img,totaltime=totaltime,x1=x1,model1name=model1name,c1=c1)
+    meta_data = _make_meta_as_json(inp)
+    res2 = dict(stylizedImage=img,totaltime=totaltime,x1=x1,model1name=model1name,c1=c1,meta=meta_data)
     return res2