Improve request handling

openpype/modules/default_modules/shotgrid/lib/server.py

@@ -3,15 +3,24 @@
 from openpype_modules.shotgrid.lib import settings as settings_lib
 
 
+def _format_url(url: str) -> str:
+ if not url.startswith('http://') or not url.startswith('https://'):
+ return "http://" + url
+ return url
+
+
 def poll_server() -> int:
- module_url = settings_lib.get_module_server_url()
+ module_url = _format_url(settings_lib.get_module_server_url())
  url = "/".join([module_url, "docs"])
- res = requests.get(url)
+ try:
+ res = requests.get(url)
+ except requests.exceptions.RequestException:
+ return 404
  return res.status_code
 
 
 def check_batch_settings(project: str, settings: Dict[str, any]) -> bool:
- module_url = settings_lib.get_module_server_url()
+ module_url = _format_url(settings_lib.get_module_server_url())
  url = "/".join([module_url, "batch", project, "check"])
  params = {
  "shotgrid_url": settings.get("auth", {}).get("project_shotgrid_url"),
@@ -24,7 +33,10 @@ def check_batch_settings(project: str, settings: Dict[str, any]) -> bool:
  ),
  }
 
- res = requests.get(url, params=params)
+ try:
+ res = requests.get(url, params=params)
+ except requests.exceptions.RequestException:
+ return False
 
  if res.status_code == 200:
  return res.json().get("status", "KO") == "OK"
@@ -36,7 +48,7 @@ def send_batch_request(
  project: str, settings: Dict[str, any], override: bool
 ) -> int:
 
- module_url = settings_lib.get_module_server_url()
+ module_url = _format_url(settings_lib.get_module_server_url())
  url = "/".join([module_url, "batch", project])
  payload = {
  "shotgrid_url": settings.get("auth", {}).get("project_shotgrid_url"),
@@ -47,9 +59,13 @@ def send_batch_request(
  "script_key": settings.get("auth", {}).get(
  "project_shotgrid_script_key"
  ),
- "override": override,
+ "overwrite": override,
  "fields_mapping": settings.get("fields", {}),
  }
 
- res = requests.post(url, json=payload)
+ try:
+ res = requests.post(url, json=payload)
+ except requests.exceptions.RequestException:
+ return 404
+
  return res.status_code

openpype/modules/default_modules/shotgrid/tray/batch_dialog.py

@@ -37,7 +37,7 @@ def __init__(self, module, parent=None):
 
  self.setWindowTitle("OpenPype - Shotgrid Batch")
 
- icon = QtGui.QIcon(resources.pype_icon_filepath())
+ icon = QtGui.QIcon(resources.get_resource("app_icons/shotgrid.png"))
  self.setWindowIcon(icon)
 
  self.setWindowFlags(