Merge branch 'master' into email_on_complete

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +1,14 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report a specific issue where something is not working.
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+A clear and concise description of what the bug is. What are you trying to do and what is not working?
 
 **To Reproduce**
 Steps to reproduce the behavior:
@@ -21,8 +21,12 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **4CAT Environment**
- - How are you accessing 4CAT? [e.g. 4cat.oilab.nl or your own server/desktop]
- - If accessing via your own server/desktop, what is the environment and are you using Docker?
+ - How are you accessing 4CAT? If possible, include the 4CAT web interface URL. Otherwise, explain if you are running 4CAT on your own device or accessing it remotely.
+ - What version of 4CAT are you using? Find the version here:
+   - In the latest versions of 4CAT, the version number is visible at the bottom of the interface
+   - If you don't see the version there, that in itself is useful information
+   - If you are using [Zeeschuimer](github.com/digitalmethodsinitiative/zeeschuimer), include its version number as well. Find it at the top of the interface.
+ - If accessing via your own server/desktop, what is the environment (e.g. the operating system) and are you using Docker?
 
 **Screenshots, links to datasets, and any additional context**
-If your 4CAT is available online (e.g. 4cat.oilab.nl) and it is related to a specific dataset, please post the link.
+If your 4CAT is available online and your issue is related to a specific dataset, please post the link.

common/lib/dmi_service_manager.py

@@ -209,7 +209,7 @@ def request_folder_files(self, folder_name):
         filename_url = f"{self.server_address}list_filenames/{folder_name}"
         filename_response = requests.get(filename_url, timeout=30)
 
-        # Check if 4CAT has access to this PixPlot server
+        # Check if 4CAT has access to this server
         if filename_response.status_code == 403:
             raise DmiServiceManagerException("403: 4CAT does not have permission to use the DMI Service Manager server")
         elif filename_response.status_code in [400, 405]:

processors/visualisation/clip_categorize_images.py

@@ -213,8 +213,10 @@ def process(self):
                 if self.interrupted:
                     raise ProcessorInterruptedException("Interrupted while writing results to file")
 
-                self.dataset.log(f"Writing {result_filename}...")
                 with open(output_dir.joinpath(result_filename), "r") as result_file:
+                    if not result_filename.endswith(".json"):
+                        self.dataset.log(f"Skipping {result_filename} (not a JSON results file)")
+                        continue
                     result_data = json.loads(''.join(result_file))
                     image_name = ".".join(result_filename.split(".")[:-1])
                     data = {