Merge pull request #202 from jdi-testing/issue_1598-Pass-screen-resol…

…ution-to-selenoid Viewport model type changed
jdi-testing · Aug 27, 2024 · 9a96c17 · 9a96c17
2 parents fdf049f + c3c8906
commit 9a96c17
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/models.py b/app/models.py
@@ -61,7 +61,7 @@ class PredictionRequestElement(BaseModel):
 class PredictionInputModel(BaseModel):
     document: str
     elements: str
-    viewport: Dict
+    viewport: str
 
 
 class PredictedElement(BaseModel):

diff --git a/ds_methods/angular_predict.py b/ds_methods/angular_predict.py
@@ -23,7 +23,7 @@ async def angular_predict_elements(body):
     body_json = json.loads(body_str)
     elements_json = body_json.get("elements", [])
     document_json = body_json.get("document", "")
-    viewport_json = body_json.get("viewport", {})
+    viewport_json = json.loads(body_json.get("viewport", "{}"))
 
     # create softmax layser function to get probabilities from logits
     softmax = torch.nn.Softmax(dim=1)

diff --git a/ds_methods/html5_predict.py b/ds_methods/html5_predict.py
@@ -22,7 +22,7 @@ async def html5_predict_elements(body):
     body_json = json.loads(body_str)
     elements_json = body_json.get("elements", [])
     document_json = body_json.get("document", "")
-    viewport_json = body_json.get("viewport", {})
+    viewport_json = json.loads(body_json.get("viewport", "{}"))
 
     # generate temporary filename
     filename = dt.datetime.now().strftime("%Y%m%d%H%M%S%f.json")

diff --git a/ds_methods/mui_predict.py b/ds_methods/mui_predict.py
@@ -23,7 +23,7 @@ async def mui_predict_elements(body):
     body_json = json.loads(body_str)
     elements_json = body_json.get("elements", [])
     document_json = body_json.get("document", "")
-    viewport_json = body_json.get("viewport", {})
+    viewport_json = json.loads(body_json.get("viewport", "{}"))
 
     # create softmax layser function to get probabilities from logits
     softmax = torch.nn.Softmax(dim=1)