From 8fb4fb2b5e5a57c0fbbf6ba58a0f9ff2c80e4e39 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Wed, 19 May 2021 15:24:09 +0300
Subject: [PATCH] Fix Task.add_requirements() passing package_version starting
 with @ or ; or #

---
 clearml/backend_interface/task/repo/scriptinfo.py | 6 +++---
 clearml/logger.py                                 | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/clearml/backend_interface/task/repo/scriptinfo.py b/clearml/backend_interface/task/repo/scriptinfo.py
index e2db3b7c..fccb947c 100644
--- a/clearml/backend_interface/task/repo/scriptinfo.py
+++ b/clearml/backend_interface/task/repo/scriptinfo.py
@@ -216,10 +216,10 @@ class ScriptRequirements(object):
             requirements_txt += '{0}\n'.format(version)
         elif k.startswith('-e '):
             requirements_txt += '{0} {1}\n'.format(k.replace('-e ', '', 1), version or '')
-        elif version and (str(version).strip() or ' ')[0] in '><~=':
-            requirements_txt += '{0} {1}\n'.format(k, version)
-        elif version and str(version).strip():
+        elif version and str(version or ' ').strip()[0].isdigit():
             requirements_txt += '{0} {1} {2}\n'.format(k, '==', version)
+        elif version and str(version).strip():
+            requirements_txt += '{0} {1}\n'.format(k, version)
         else:
             requirements_txt += '{0}\n'.format(k)
         return requirements_txt
diff --git a/clearml/logger.py b/clearml/logger.py
index 5b68477d..787dfb1e 100644
--- a/clearml/logger.py
+++ b/clearml/logger.py
@@ -1014,7 +1014,8 @@ class Logger(object):
             figure=figure,
             iter=iteration or 0,
             logger=self,
-            force_save_as_image=False if report_interactive else ('png' if report_image else True),
+            force_save_as_image=False if report_interactive and not report_image
+            else ('png' if report_image else True),
         )
 
     def set_default_upload_destination(self, uri):