@@ -58,16 +58,15 @@ def validate_custom_image_tag(image_tag: str, config: dict, codegen_name: str) -
5858        return  None , None 
5959
6060    # Get validation configuration (with defaults) 
61-     allowed_repos  =  config .get ('TOPCP_ALLOWED_REPOSITORIES' , [
62-         'sslhep/servicex_science_image_topcp' ,
63-         'registry.gitlab.com/topcp-project/toolkit' 
64-     ])
65-     tag_pattern  =  config .get ('TOPCP_IMAGE_TAG_PATTERN' , r'^v?\d+\.\d+\.\d+[-_]v?\d+\.\d+$' )
66-     default_base_image  =  config .get ('TOPCP_DEFAULT_BASE_IMAGE' , 'sslhep/servicex_science_image_topcp' )
61+     tag_pattern  =  config .get ('TOPCP_IMAGE_TAG_PATTERN' ,
62+                              r'^v?\d+\.\d+\.\d+[-_]v?\d+\.\d+$' )
63+     default_base_image  =  config .get ('TOPCP_DEFAULT_BASE_IMAGE' ,
64+                                     'sslhep/servicex_science_image_topcp' )
6765
6866    # Validate tag format 
6967    if  not  re .match (tag_pattern , image_tag ):
70-         raise  BadRequest (f"Invalid TopCP image tag format: { image_tag }  )
68+         raise  BadRequest (f"Invalid TopCP image tag format: { image_tag }  
69+                          f"Expected format: v2.20.0_v0.2" )
7170
7271    # For now, use the default base image with the custom tag 
7372    # In the future, this could be extended to allow custom repositories 
@@ -97,6 +96,7 @@ def _extract_custom_image_tag(self, selection: str, codegen_name: str) -> Option
9796        except  (json .JSONDecodeError , AttributeError ):
9897            # Invalid JSON or non-dict selection 
9998            return  None 
99+ 
100100    @classmethod  
101101    def  make_api (
102102        cls ,
@@ -270,7 +270,8 @@ def post(self):
270270            )
271271
272272            # Extract custom image tag from TopCP queries before code generation 
273-             custom_image_tag  =  self ._extract_custom_image_tag (request_rec .selection , user_codegen_name )
273+             custom_image_tag  =  self ._extract_custom_image_tag (
274+                 request_rec .selection , user_codegen_name )
274275
275276            # The first thing to do is make sure the requested selection is correct, 
276277            # and can generate the requested code 
0 commit comments