Revert "Merge develop into master"

compute_worker/compute_worker.py

@@ -507,25 +507,12 @@ async def _run_container_engine_cmd(self, engine_cmd, kind):
         websocket = await websockets.connect(self.websocket_url)
         websocket_errors = (socket.gaierror, websockets.WebSocketException, websockets.ConnectionClosedError, ConnectionRefusedError)
 
-        # Function to read a line, if the line is larger than the buffer size we will
-        # return the buffer so we can continue reading until we get a newline, rather
-        # than getting a LimitOverrunError
-        async def _readline_or_chunk(stream):
-            try:
-                return await stream.readuntil(b"\n")
-            except asyncio.exceptions.IncompleteReadError as e:
-                # Just return what has been read so far
-                return e.partial
-            except asyncio.exceptions.LimitOverrunError as e:
-                # If we get a LimitOverrunError, we will return the buffer so we can continue reading
-                return await stream.read(e.consumed)
-
         while any(v["continue"] for k, v in self.logs[kind].items() if k in ['stdout', 'stderr']):
             try:
                 logs = [self.logs[kind][key] for key in ('stdout', 'stderr')]
                 for value in logs:
                     try:
-                        out = await asyncio.wait_for(_readline_or_chunk(value["stream"]), timeout=.1)
+                        out = await asyncio.wait_for(value["stream"].readline(), timeout=.1)
                         if out:
                             value["data"] += out
                             print("WS: " + str(out))

docker-compose.yml

@@ -231,4 +231,4 @@ services:
     logging:
       options:
         max-size: "20k"
-        max-file: "10"
+        max-file: "10"

src/apps/api/serializers/competitions.py

@@ -254,10 +254,7 @@ class Meta:
             'registration_auto_approve',
             'queue',
             'enable_detailed_results',
-            'show_detailed_results_in_submission_panel',
-            'show_detailed_results_in_leaderboard',
             'auto_run_submissions',
-            'can_participants_make_submissions_public',
             'make_programs_available',
             'make_input_data_available',
             'docker_image',
@@ -376,10 +373,7 @@ class Meta:
             'submission_count',
             'queue',
             'enable_detailed_results',
-            'show_detailed_results_in_submission_panel',
-            'show_detailed_results_in_leaderboard',
             'auto_run_submissions',
-            'can_participants_make_submissions_public',
             'make_programs_available',
             'make_input_data_available',
             'docker_image',

src/apps/api/serializers/submissions.py

@@ -42,7 +42,6 @@ class SubmissionSerializer(serializers.ModelSerializer):
     task = TaskSerializer()
     created_when = serializers.DateTimeField(format="%Y-%m-%d %H:%M")
     auto_run = serializers.SerializerMethodField(read_only=True)
-    can_make_submissions_public = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = Submission
@@ -68,8 +67,7 @@ class Meta:
             'leaderboard',
             'on_leaderboard',
             'task',
-            'auto_run',
-            'can_make_submissions_public',
+            'auto_run'
         )
         read_only_fields = (
             'pk',
@@ -87,10 +85,6 @@ def get_auto_run(self, instance):
         # returns this submission's competition auto_run_submissions Flag
         return instance.phase.competition.auto_run_submissions
 
-    def get_can_make_submissions_public(self, instance):
-        # returns this submission's competition can_participants_make_submissions_public Flag
-        return instance.phase.competition.can_participants_make_submissions_public
-
 
 class SubmissionLeaderBoardSerializer(serializers.ModelSerializer):
     scores = SubmissionScoreSerializer(many=True)

src/apps/api/views/submissions.py

@@ -352,15 +352,15 @@ def get_detail_result(self, request, pk):
                 )
         else:
             return Response({
-                "error_msg": "Detailed results are disable for this competition!"},
+                "error_msg": "Visualizations are disabled"},
                 status=status.HTTP_404_NOT_FOUND
             )
 
     @action(detail=True, methods=('GET',))
     def toggle_public(self, request, pk):
         submission = super().get_object()
-        if not submission.phase.competition.can_participants_make_submissions_public:
-            raise PermissionDenied("You do not have permission to make this submissions public/private")
+        if not self.has_admin_permission(request.user, submission):
+            raise PermissionDenied(f'You do not have permission to publish this submissions')
         is_public = not submission.is_public
         submission.data.is_public = is_public
         submission.data.save(send=False)

src/apps/competitions/models.py

@@ -49,10 +49,6 @@ class Competition(ChaHubSaveMixin, models.Model):
     description = models.TextField(null=True, blank=True)
     docker_image = models.CharField(max_length=128, default="codalab/codalab-legacy:py37")
     enable_detailed_results = models.BooleanField(default=False)
-    # If true, show detailed results in submission panel
-    show_detailed_results_in_submission_panel = models.BooleanField(default=True)
-    # If true, show detailed results in leaderboard
-    show_detailed_results_in_leaderboard = models.BooleanField(default=True)
     make_programs_available = models.BooleanField(default=False)
     make_input_data_available = models.BooleanField(default=False)
 
@@ -73,9 +69,6 @@ class Competition(ChaHubSaveMixin, models.Model):
     # if false, submissions run will be intiiated by organizer
     auto_run_submissions = models.BooleanField(default=True)
 
-    # If true, participants see the make their submissions public
-    can_participants_make_submissions_public = models.BooleanField(default=True)
-
     def __str__(self):
         return f"competition-{self.title}-{self.pk}-{self.competition_type}"
 

src/apps/competitions/unpackers/v1.py

@@ -23,8 +23,6 @@ def __init__(self, *args, **kwargs):
             "description": self.competition_yaml.get("description", ""),
             "docker_image": docker_image,
             "enable_detailed_results": self.competition_yaml.get('enable_detailed_results', False),
-            "show_detailed_results_in_submission_panel": self.competition_yaml.get('show_detailed_results_in_submission_panel', True),
-            "show_detailed_results_in_leaderboard": self.competition_yaml.get('show_detailed_results_in_leaderboard', True),
             "auto_run_submissions": self.competition_yaml.get('auto_run_submissions', True),
             "make_programs_available": self.competition_yaml.get('make_programs_available', False),
             "make_input_data_available": self.competition_yaml.get('make_input_data_available', False),

src/apps/competitions/unpackers/v2.py

@@ -14,10 +14,7 @@ def __init__(self, *args, **kwargs):
             "registration_auto_approve": self.competition_yaml.get('registration_auto_approve', False),
             "docker_image": self.competition_yaml.get('docker_image', 'codalab/codalab-legacy:py37'),
             "enable_detailed_results": self.competition_yaml.get('enable_detailed_results', False),
-            "show_detailed_results_in_submission_panel": self.competition_yaml.get('show_detailed_results_in_submission_panel', True),
-            "show_detailed_results_in_leaderboard": self.competition_yaml.get('show_detailed_results_in_leaderboard', True),
             "auto_run_submissions": self.competition_yaml.get('auto_run_submissions', True),
-            "can_participants_make_submissions_public": self.competition_yaml.get('can_participants_make_submissions_public', True),
             "make_programs_available": self.competition_yaml.get('make_programs_available', False),
             "make_input_data_available": self.competition_yaml.get('make_input_data_available', False),
             "description": self.competition_yaml.get("description", ""),