Update my_spawner.py

extraFiles/my_spawner.py

@@ -14,20 +14,56 @@ class MySpawner(KubeSpawner):
 
         if not self.profile_list or not hasattr(self, '_profile_list'):
             return formdata
-        selected_profile = int(formdata.get('profile', [0])[0])
-        options = self._profile_list[selected_profile]
-        self.log.debug("Applying KubeSpawner override for profile '%s'", options['display_name'])
-        kubespawner_override = options.get('kubespawner_override', {})
-        for k, v in kubespawner_override.items():
-            if callable(v):
-                v = v(self)
-                self.log.debug(".. overriding KubeSpawner value %s=%s (callable result)", k, v)
-            else:
-                self.log.debug(".. overriding KubeSpawner value %s=%s", k, v)
-            setattr(self, k, v)
-
-        gpus = int(formdata.get('gpus', [0])[0])
-        
+
+
+        #https://github.com/jupyterhub/kubespawner/blob/main/kubespawner/spawner.py#L3046
+        profile_slug = formdata.get('profile', [None])[0]
+
+          # initialize a dictionary to return
+          user_options = {}
+
+          # if a profile is declared, add a dictionary key for the profile, and
+          # dictionary keys for the formdata related to the profile's
+          # profile_options, as recognized by being named like:
+          #
+          #     profile-option-{profile_slug}--{profile_option_slug}
+          #
+          if profile_slug:
+              user_options["profile"] = profile_slug
+              prefix = f'profile-option-{profile_slug}--'
+              for k, v in formdata.items():
+                  if k.startswith(prefix):
+                      profile_option_slug = k[len(prefix) :]
+                      user_options[profile_option_slug] = v[0]
+
+          gpus = int(formdata.get('gpus', [0])[0])
+
+          for k, v in kubespawner_override.items():
+              if callable(v):
+                  v = v(self)
+                  self.log.info(".. overriding KubeSpawner value %s=%s (callable result)", k, v)
+              else:
+                  self.log.info(".. overriding KubeSpawner value %s=%s", k, v)
+
+              if k != "image":
+                setattr(self, k, v)
+              else:
+                image = v
+                if isinstance(v, dict):
+                  if gpus > 0:
+                    image = v["cuda"]
+                  else:
+                    image = v["cpu"]
+
+                if not (":" in image):
+                  self.log.info(".. adding tag %s  to image %s", formdata.get('tag', [0])[0], image)
+                  image += ":"+formdata.get('tag', [0])[0]
+
+                setattr(self, k, image)
+
+
+        setattr(self, "tag", formdata.get('tag', [0])[0]) 
+
         setattr(self, "extra_resource_limits", {"nvidia.com/gpu": gpus})
         setattr(self, "mem_guarantee", formdata.get('ram', [0])[0]+"G")
         setattr(self, "cpu_guarantee", float(formdata.get('cores', [0])[0]))
@@ -133,8 +169,9 @@ class MySpawner(KubeSpawner):
 
 
         setattr(self, 'startTimeout', 1200)
-        
-        return options
+        self.log.info(options)
+
+        return user_options
 
     profile_list = [
         {