From 14aeb585ae6b08d3216e9ca5503da86700bf52fd Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 12 Nov 2025 11:15:24 +0000 Subject: [PATCH 01/12] fix: ensure sasjs_prefix exists before referencing it --- base/mp_assertscope.sas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/mp_assertscope.sas b/base/mp_assertscope.sas index f1dfc70..213b146 100644 --- a/base/mp_assertscope.sas +++ b/base/mp_assertscope.sas @@ -73,10 +73,6 @@ ignorelist=, outds=work.test_results )/*/STORE SOURCE*/; -%local ds test_result test_comments del add mod ilist; -%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE - SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist); - /** * this sets up the global vars, it will also enter STRICT mode. If this * behaviour is not desired, simply initiate the following global macro @@ -84,6 +80,10 @@ */ %mp_init() +%local ds test_result test_comments del add mod ilist; +%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE + SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist); + /* get current variables */ %if &action=SNAPSHOT %then %do; proc sql; From 569533b218b15812e8d1ba4380d3a14b364c72ab Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 12 Nov 2025 11:17:31 +0000 Subject: [PATCH 02/12] fix: apply viya file type properties to newly created viya files --- .../viyaonly/mv_getviyafileextparms.test.sas | 95 ++++++++++ viya/mv_createfile.sas | 88 +++++++-- viya/mv_getviyafileextparms.sas | 179 ++++++++++++++++++ 3 files changed, 343 insertions(+), 19 deletions(-) create mode 100644 tests/viyaonly/mv_getviyafileextparms.test.sas create mode 100644 viya/mv_getviyafileextparms.sas diff --git a/tests/viyaonly/mv_getviyafileextparms.test.sas b/tests/viyaonly/mv_getviyafileextparms.test.sas new file mode 100644 index 0000000..86b2c9e --- /dev/null +++ b/tests/viyaonly/mv_getviyafileextparms.test.sas @@ -0,0 +1,95 @@ +/** + @file + @brief Testing mv_getviyafileextparms macro + +

SAS Macros

+ @li mf_isBlank.sas + @li mp_assert.sas + @li mp_assertscope.sas + @li mv_getviyafileextparms.sas + +**/ + +options mprint; + +%let mvarIgnoreList = + MC0_JADP1LEN MC0_JADP2LEN MC0_JADP3LEN MC0_JADPNUM MC0_JADVLEN; + +%put TEST 1 - Test with common extension, requesting only typeDefName parameter; +%mp_assertscope(SNAPSHOT) +%mv_getviyafileextparms(ext=txt, typeDefNameVar=viyaTypeDefName) +%mp_assertscope(COMPARE + ,ignorelist=&mvarIgnoreList viyaTypeDefName +) + +%mp_assert( + iftrue=(not %mf_isBlank(&viyaTypeDefName)), + desc=Check the requested macro variable viyaTypeDefName is not blank. +) + +%put TEST 2 - Test with common extension, requesting only properties parameter; +%mp_assertscope(SNAPSHOT) +%mv_getviyafileextparms(ext=html, propertiesVar=viyaProperties) +%mp_assertscope(COMPARE + ,ignorelist=&mvarIgnoreList viyaProperties +) + +%mp_assert( + iftrue=(not %mf_isBlank(&viyaProperties)), + desc=Check the requested macro variable viyaProperties is not blank. +) + +%put TEST 3 - Test with common extension, requesting only mediaType parameter; +%mp_assertscope(SNAPSHOT) +%mv_getviyafileextparms(ext=mp3, mediaTypeVar=viyaMediaType) +%mp_assertscope(COMPARE + ,ignorelist=&mvarIgnoreList viyaMediaType +) + +%mp_assert( + iftrue=(not %mf_isBlank(&viyaMediaType)), + desc=Check the requested macro variable viyaMediaType is not blank. +) + +%put TEST 4 - Test with common extension, requesting all parameters; +%mp_assertscope(SNAPSHOT) +%mv_getviyafileextparms( + ext=css, + typeDefNameVar=cssViyaTypeDefName, + propertiesVar=cssViyaProperties, + mediaTypeVar=cssViyaMediaType + ) +%mp_assertscope(COMPARE + ,ignorelist= + &mvarIgnoreList cssViyaTypeDefName cssViyaProperties cssViyaMediaType +) + +%mp_assert( + iftrue=(not ( %mf_isBlank(&cssViyaTypeDefName) or + %mf_isBlank(&cssViyaProperties) or + %mf_isBlank(&cssViyaMediaType) ) ), + desc=Check a full set of requested macro variables are not blank. +) + + +%put TEST 5 - Test with invalid extension - requested parameters will be blank; +%mp_assertscope(SNAPSHOT) +%mv_getviyafileextparms( + ext=xxxINVALIDxxx, + typeDefNameVar=invalidTypeDefName, + propertiesVar=invalidProperties, + mediaTypeVar=invalidMediaType + ) +%mp_assertscope(COMPARE + ,ignorelist= + &mvarIgnoreList invalidTypeDefName invalidProperties invalidMediaType +) + +%mp_assert( + iftrue=( + %mf_isBlank(&invalidTypeDefName) and + %mf_isBlank(&invalidProperties) and + %mf_isBlank(&invalidMediaType) + ), + desc=Check the requested macro variables are all blank. +) diff --git a/viya/mv_createfile.sas b/viya/mv_createfile.sas index 1c00e28..bc36463 100644 --- a/viya/mv_createfile.sas +++ b/viya/mv_createfile.sas @@ -69,6 +69,7 @@ @li mp_base64copy.sas @li mp_replace.sas @li mv_createfolder.sas + @li mv_getviyafileextparms.sas

Related Macros

@li mv_createfile.sas @@ -153,7 +154,7 @@ options noquotelenmax; %local base_uri; /* location of rest apis */ -%let base_uri=%mf_getplatform(VIYARESTAPI); +%let base_uri=%trim(%mf_getplatform(VIYARESTAPI)); /* create folder if it does not already exist */ %local folderds self_uri; @@ -172,7 +173,7 @@ run; /* abort or delete if file already exists */ %let force=%upcase(&force); %local fileuri ; -%let fileuri=%mfv_getpathuri(&path/&name); +%let fileuri=%trim(%mfv_getpathuri(&path/&name)); %mp_abort(iftrue=(%mf_isblank(&fileuri)=0 and &force ne YES) ,mac=MV_CREATEFILE ,msg=%str(File &path/&name already exists and force=&force) @@ -201,6 +202,12 @@ run; %let url=&base_uri/files/files?parentFolderUri=&self_uri; %let ext=%upcase(%scan(&name,-1,.)); +/* Get Viya file-extension details into some macro variables */ +%mv_getViyaFileExtParms(&ext + ,propertiesVar=viyaProperties + ,typeDefNameVar=viyaTypeDefName + ,mdebug=&mdebug); + /* fetch job info */ %local fname1; %let fname1=%mf_getuniquefileref(); @@ -212,12 +219,18 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref %else %do; ct="&ctype" %end; - %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" - or "&ext"="SVG" %then %do; - url="&url%str(&)typeDefName=file"; + + %if not %mf_isBlank(&viyaTypeDefName) %then %do; + url="&url%str(&)typeDefName=&viyaTypeDefName"; %end; %else %do; - url="&url"; + %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" + or "&ext"="SVG" %then %do; + url="&url%str(&)typeDefName=file"; + %end; + %else %do; + url="&url"; + %end; %end; headers "Accept"="application/json" @@ -239,26 +252,63 @@ run; ,mac=MV_CREATEFILE ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) ) -%local libref2; -%let libref2=%mf_getuniquelibref(); -libname &libref2 JSON fileref=&fname1; -/* Grab the follow on link */ -data &outds; - set &libref2..links end=last; - if rel='createChild' then do; - call symputx('href',quote(cats("&base_uri",href)),'l'); - &dbg put (_all_)(=); - end; -run; -%put &sysmacroname: %trim(&base_uri)%mfv_getpathuri(&path/&name); +/* URI of the created file */ +%let fileuri=%trim(%mfv_getpathuri(&path/&name)); + +/* If properties were found then patch the file to include them */ +%if not %mf_isBlank(&viyaProperties) %then %do; + /* Wrap the properties object in a root object also containing the file name */ + %local viyapatch; + %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_); + data _null_; + length line $32767; + file "&viyapatch" lrecl=32767; + put '{ "name": "' "&name" '",'; + line = cat('"properties": ',symget("viyaProperties")); + put line; + put '}'; + stop; + run; + + %if &mdebug=1 %then %do; + data _null_; + if (_n_ eq 1) then put 'DEBUG: ** PATCH JSON **'; + infile "&viyapatch" end=last; + input; + put _infile_; + run; + %end; + + /* And apply the properties to the newly created file, using the PATCH method */ + %let fref=%mf_getuniquefileref(); + filename &fref "&viyapatch"; + %let url=&base_uri&fileuri; + + proc http method='PATCH' oauth_bearer=sas_services in=&fref + url="&url"; + headers "Accept"="application/json" + "Content-Type"="application/json" + "If-Match"="*"; + %if &mdebug=1 %then %do; + debug level=2; + %end; + run; + %if &mdebug=1 %then %put &sysmacroname PATCH &=url + &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; + %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 200) + ,mac=MV_CREATEFILE + ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) + ) +%end; + +%put &sysmacroname: &base_uri&fileuri; %put /SASJobExecution?_file=&path/&name;%put; %if &mdebug=0 %then %do; /* clear refs */ filename &fname1 clear; filename &fref clear; - libname &libref2 clear; %end; %mp_abort( diff --git a/viya/mv_getviyafileextparms.sas b/viya/mv_getviyafileextparms.sas new file mode 100644 index 0000000..09a9623 --- /dev/null +++ b/viya/mv_getviyafileextparms.sas @@ -0,0 +1,179 @@ +/** + @file mv_getviyafileextparms.sas + @brief Reads the VIYA file-extension type definition and returns selected + values in SAS macro variables + + @details Content is derived from the following endpoint: + "https:///types/types?filter=contains(extensions,'')" + + @param [in] ext File extension to retrieve property info for. + @param [out] propertiesVar= SAS macro variable name that will contain + the 'properties' object json, if found, else blank. + @param [out] typeDefNameVar= SAS macro variable name that will contain + the 'typeDefName' property value, if found, else blank. + @param [out] mediaTypeVar= SAS macro variable name that will contain + the 'mediaType' property value, if found, else blank. + @param [in] mdebug= (0) Set to 1 to enable DEBUG messages + +

SAS Macros

+ @li mf_abort.sas + @li mf_existds.sas + @li mf_getplatform.sas + @li mf_getuniquefileref.sas + @li mf_getuniquename.sas + @li mf_getvalue.sas + @li mf_getvarlist.sas + @li mf_getvartype.sas + +*/ + +%macro mv_getViyaFileExtParms(ext,typeDefNameVar=,propertiesVar=,mediaTypeVar=,mdebug=0); + %local base_uri; /* location of rest apis */ + %local viyatypedef; /* temp fileref to json response */ + %local url; /* File extension info end-point */ + + %mf_abort(iftrue=(%mf_isBlank(&ext)) + ,msg=%str(MV_GETVIYAFILEEXTPARMS - No file extension provided.) + ); + + %mf_abort(iftrue=(%mf_isBlank(&typeDefNameVar) and + %mf_isBlank(&propertiesVar) and + %mf_isBlank(&mediaTypeVar)) + ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.) + ); + + /* Declare requested parameters as global macro vars and initialize blank */ + %if not %mf_isBlank(&typeDefNameVar) %then %do; + %global &typeDefNameVar; + %let &typeDefNameVar = %str(); + %end; + %if not %mf_isBlank(&propertiesVar) %then %do; + %global &propertiesVar; + %let &propertiesVar = %str(); + %end; + %if not %mf_isBlank(&mediaTypeVar) %then %do; + %global &mediaTypeVar; + %let &mediaTypeVar = %str(); + %end; + + %let base_uri=%mf_getplatform(VIYARESTAPI); + %if &mdebug=1 %then %do; + %put DEBUG: &SYSMACRONAME &=base_uri; + %end; + + %let ext=%lowcase(&ext); + + /* Create a temp file and fill with JSON that declares */ + /* VIYA file-type details for the given file extension */ + %let viyatypedef=%mf_getuniquefileref(); + filename &viyatypedef temp; + + %let url = &base_uri/types/types?filter=contains(extensions,%str(%')&ext%str(%')); + + proc http oauth_bearer=sas_services out=&viyatypedef + url="&url"; + run; + + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=url + &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; + + %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do; + /* To avoid a breaking change, exit early if the request failed. + The calling process will proceed with empty requested macro variables. */ + %put INFO: &sysmacroname A response was not returned.; + filename &viyatypedef clear; + %return; + %end; + + %if &mdebug=1 %then %do; + data _null_; + infile &viyatypedef; + input; + put "DEBUG: &SYSMACRONAME" _infile_; + run; + %end; + + /* Convert the content of that JSON into SAS datasets */ + /* First prepare a new WORK-based folder to receive the datasets */ + %local jsonworkfolder jsonlib opt_dlcreatedir; + %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_); + %let jsonlib=%mf_getuniquelibref(prefix=json); + /* And point a libname at it */ + %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir)); + options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir; + + /* Read the json output once and copy datasets to its work folder */ + %local libref1; + %let libref1=%mf_getuniquelibref(); + libname &libref1 JSON fileref=&viyatypedef automap=create; + proc copy in=&libref1 out=&jsonlib; run; + + /* Populate typeDefName, if requested */ + %if (not %mf_isBlank(&typeDefNameVar)) %then %do; + %let &typeDefNameVar = %mf_getvalue(&jsonlib..alldata,value,filter=%quote(p1="items" and p2="name")); + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar; + %end; + + /* Populate mediaType, if requested */ + %if (not %mf_isBlank(&mediaTypeVar)) %then %do; + %let &mediaTypeVar = %mf_getvalue(&jsonlib..alldata,value,filter=%quote(p1="items" and p2="mediaType")); + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar; + %end; + + /* Populate properties macro variable, if requested */ + %if not %mf_isBlank(&propertiesVar) %then %do; + /* Check for the items_properties table */ + %if ( not %mf_existds(&jsonlib..ITEMS_PROPERTIES) ) %then %do; + %let &propertiesVar = %str(); + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%'); + %end; + %else %do; + /* Properties potentially span multiple rows in the ITEMS_PROPERTIES table */ + /* First remove some unwanted variables from the items_properties dataset. */ + %let dsTemplate=%mf_getuniquename(prefix=dsTemplate_); + data work.&dsTemplate; + stop; + set &jsonlib..ITEMS_PROPERTIES(drop=ordinal:); + run; + + /* Retrieve the names of the remaining variables */ + /* These are the names of the properties. */ + %let varlist = %mf_getvarlist(work.&dsTemplate); + %if &mdebug %then %put DEBUG: &SYSMACRONAME &=varlist; + + %let &propertiesVar = %quote({); + + %let nvars = %sysfunc(countw(&varlist)); + %do i = 1 %to &nvars; + /* Use the name of each variable in the dataset as the property 'key' */ + %let key = %scan(&varlist,&i); + %let value = %mf_getvalue(&jsonlib..ITEMS_PROPERTIES,&key); + /* The data type determines if value should be quoted in the output*/ + %if %mf_getvartype(&jsonlib..ITEMS_PROPERTIES,&key) = C %then %do; + %let value = "&value"; + %end; + /* Transform the character '_', to '.' if found in the key */ + %let key = %sysfunc(translate(&key,.,_)); + /* Build the line to output */ + %let line="&key": &value; + /* ...adding a comma to all but the final line in the object */ + %if &i < &nvars %then %let line = &line%str(,); + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME line=%quote(&line); + %let &propertiesVar = &&&propertiesVar %quote(&line); + %end; + /* Close off the properties object */ + %let &propertiesVar = &&&propertiesVar %quote(}); + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=propertiesVar &propertiesVar=&&&propertiesVar; + %end; + + %end; + + %if &mdebug=0 %then %do; + proc datasets library=&jsonlib nolist kill; quit; + libname &jsonlib clear; + %end; + + libname &libref1 clear; + filename &viyatypedef clear; + +%mend; \ No newline at end of file From 1cd8ba03c506a26121f8847deb90490ffa559783 Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Tue, 18 Nov 2025 23:56:54 +0000 Subject: [PATCH 03/12] chore: improved file-type handling efficiency --- .../viyaonly/mv_getviyafileextparms.test.sas | 6 +- viya/mv_getviyafileextparms.sas | 257 +++++++++++------- 2 files changed, 165 insertions(+), 98 deletions(-) diff --git a/tests/viyaonly/mv_getviyafileextparms.test.sas b/tests/viyaonly/mv_getviyafileextparms.test.sas index 86b2c9e..d99887e 100644 --- a/tests/viyaonly/mv_getviyafileextparms.test.sas +++ b/tests/viyaonly/mv_getviyafileextparms.test.sas @@ -35,7 +35,7 @@ options mprint; ) %mp_assert( - iftrue=(not %mf_isBlank(&viyaProperties)), + iftrue=(not %mf_isBlank(%superq(viyaProperties))), desc=Check the requested macro variable viyaProperties is not blank. ) @@ -66,7 +66,7 @@ options mprint; %mp_assert( iftrue=(not ( %mf_isBlank(&cssViyaTypeDefName) or - %mf_isBlank(&cssViyaProperties) or + %mf_isBlank(%superq(cssViyaProperties)) or %mf_isBlank(&cssViyaMediaType) ) ), desc=Check a full set of requested macro variables are not blank. ) @@ -88,7 +88,7 @@ options mprint; %mp_assert( iftrue=( %mf_isBlank(&invalidTypeDefName) and - %mf_isBlank(&invalidProperties) and + %mf_isBlank(%superq(invalidProperties)) and %mf_isBlank(&invalidMediaType) ), desc=Check the requested macro variables are all blank. diff --git a/viya/mv_getviyafileextparms.sas b/viya/mv_getviyafileextparms.sas index 09a9623..f7f40ab 100644 --- a/viya/mv_getviyafileextparms.sas +++ b/viya/mv_getviyafileextparms.sas @@ -13,10 +13,13 @@ the 'typeDefName' property value, if found, else blank. @param [out] mediaTypeVar= SAS macro variable name that will contain the 'mediaType' property value, if found, else blank. + @param [out] viyaFileExtRespLibDs (work.mv_getViyaFileExtParmsResponse) + Library.name of the dataset to receive the local working copy of the initial + response that requests all file extension details. Created once per session + to avoid multiple api calls. @param [in] mdebug= (0) Set to 1 to enable DEBUG messages

SAS Macros

- @li mf_abort.sas @li mf_existds.sas @li mf_getplatform.sas @li mf_getuniquefileref.sas @@ -24,22 +27,39 @@ @li mf_getvalue.sas @li mf_getvarlist.sas @li mf_getvartype.sas + @li mp_abort.sas */ -%macro mv_getViyaFileExtParms(ext,typeDefNameVar=,propertiesVar=,mediaTypeVar=,mdebug=0); +%macro mv_getViyaFileExtParms( + ext, + typeDefNameVar=, + propertiesVar=, + mediaTypeVar=, + viyaFileExtRespLibDs=work.mv_getViyaFileExtParmsResponse, + mdebug=0 + ); %local base_uri; /* location of rest apis */ - %local viyatypedef; /* temp fileref to json response */ %local url; /* File extension info end-point */ - %mf_abort(iftrue=(%mf_isBlank(&ext)) - ,msg=%str(MV_GETVIYAFILEEXTPARMS - No file extension provided.) + %mp_abort( + iftrue=(%mf_isBlank(&ext)) + ,msg=%str(No file extension provided.) + ,mac=MV_GETVIYAFILEEXTPARMS ); - %mf_abort(iftrue=(%mf_isBlank(&typeDefNameVar) and - %mf_isBlank(&propertiesVar) and - %mf_isBlank(&mediaTypeVar)) + %mp_abort( + iftrue=(%mf_isBlank(&typeDefNameVar) and + %mf_isBlank(&propertiesVar) and + %mf_isBlank(&mediaTypeVar)) ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.) + ,mac=MV_GETVIYAFILEEXTPARMS + ); + + %mp_abort( + iftrue=(%mf_isBlank(&viyaFileExtRespLibDs)) + ,msg=%str(No dataset name provided to cache inital response.) + ,mac=MV_GETVIYAFILEEXTPARMS ); /* Declare requested parameters as global macro vars and initialize blank */ @@ -58,122 +78,169 @@ %let base_uri=%mf_getplatform(VIYARESTAPI); %if &mdebug=1 %then %do; - %put DEBUG: &SYSMACRONAME &=base_uri; + %put DEBUG: &=base_uri; %end; %let ext=%lowcase(&ext); - /* Create a temp file and fill with JSON that declares */ - /* VIYA file-type details for the given file extension */ - %let viyatypedef=%mf_getuniquefileref(); - filename &viyatypedef temp; + /* Create a local copy of the Viya response containing all file type info, if + it does not already exist. */ + %if not %mf_existds(&viyaFileExtRespLibDs) %then %do; + /* Create a temp file and fill with JSON that declares */ + /* VIYA file-type details for the given file extension */ + %local viyatypedefs; + %let viyatypedefs=%mf_getuniquefileref(); + filename &viyatypedefs temp; - %let url = &base_uri/types/types?filter=contains(extensions,%str(%')&ext%str(%')); + %let url = &base_uri/types/types?limit=999999; - proc http oauth_bearer=sas_services out=&viyatypedef - url="&url"; - run; + proc http oauth_bearer=sas_services out=&viyatypedefs + url="&url"; + run; - %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=url - &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; + %if &mdebug=1 %then %put DEBUG: &sysmacroname &=url + &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; - %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do; - /* To avoid a breaking change, exit early if the request failed. - The calling process will proceed with empty requested macro variables. */ - %put INFO: &sysmacroname A response was not returned.; - filename &viyatypedef clear; + %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do; + /* To avoid a breaking change, exit early if the request failed. + The calling process will proceed with empty requested macro variables. */ + %put INFO: &sysmacroname File extension details were not retrieved.; + filename &viyatypedefs clear; + %return; + %end; + + %if &mdebug=1 %then %do; + /* Dump the response to the log */ + data _null_; + length line $120; + null=byte(0); + infile &viyatypedefs dlm=null lrecl=120 recfm=n; + input line $120.; + if _n_ = 1 then put "DEBUG:"; + put line; + run; + %end; + + /* Convert the content of that JSON into SAS datasets */ + /* First prepare a new WORK-based folder to receive the datasets */ + %local jsonworkfolder jsonlib opt_dlcreatedir; + %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_); + %let jsonlib=%mf_getuniquelibref(prefix=json); + /* And point a libname at it */ + %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir)); + options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir; + + /* Read the json output once and copy datasets to its work folder */ + %local libref1; + %let libref1=%mf_getuniquelibref(); + libname &libref1 JSON fileref=&viyatypedefs automap=create; + proc copy in=&libref1 out=&jsonlib; run; + + libname &libref1 clear; + + /* Now give all rows belonging to the same items array a grouping value */ + data &viyaFileExtRespLibDs; + length _viyaItemIdx 8; + set &jsonlib..alldata; + retain _viyaItemIdx 0; + /* Increment the row group index when a new 'items' group is observed */ + if P=1 and P1='items' then _viyaItemIdx + 1; + run; + + %if &mdebug=0 %then %do; + /* Tidy up, unless debug=1 */ + proc datasets library=&jsonlib nolist kill; quit; + libname &jsonlib clear; + %end; + + filename &viyatypedefs clear; + + %end; /* If initial filetype query response didn't exist */ + + /* Find the row-group for the current file extension */ + %local itemRowGroup; + %let itemRowGroup = + %mf_getValue( + &viyaFileExtRespLibDs + ,_viyaItemIdx + ,filter=%quote(p1='items' and p2='extensions' and value="&ext") + ); + + %if &mdebug %then %put DEBUG: &=itemRowGroup; + + %if %mf_isBlank(&itemRowGroup) %then %do; + /* extension was not found */ + %if(&mdebug=1) %then %put DEBUG: No type details found for extension "&ext".; %return; %end; - %if &mdebug=1 %then %do; - data _null_; - infile &viyatypedef; - input; - put "DEBUG: &SYSMACRONAME" _infile_; - run; - %end; - - /* Convert the content of that JSON into SAS datasets */ - /* First prepare a new WORK-based folder to receive the datasets */ - %local jsonworkfolder jsonlib opt_dlcreatedir; - %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_); - %let jsonlib=%mf_getuniquelibref(prefix=json); - /* And point a libname at it */ - %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir)); - options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir; - - /* Read the json output once and copy datasets to its work folder */ - %local libref1; - %let libref1=%mf_getuniquelibref(); - libname &libref1 JSON fileref=&viyatypedef automap=create; - proc copy in=&libref1 out=&jsonlib; run; + /* Filter the cached response data down to the required file extension */ + %local dsItems; + %let dsItems = %mf_getuniquename(prefix=dsItems_); + data work.&dsItems; + set &viyaFileExtRespLibDs; + where _viyaItemIdx = &itemRowGroup; + run; /* Populate typeDefName, if requested */ %if (not %mf_isBlank(&typeDefNameVar)) %then %do; - %let &typeDefNameVar = %mf_getvalue(&jsonlib..alldata,value,filter=%quote(p1="items" and p2="name")); - %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar; + %let &typeDefNameVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="name")); + %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar; %end; /* Populate mediaType, if requested */ %if (not %mf_isBlank(&mediaTypeVar)) %then %do; - %let &mediaTypeVar = %mf_getvalue(&jsonlib..alldata,value,filter=%quote(p1="items" and p2="mediaType")); - %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar; + %let &mediaTypeVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="mediaType")); + %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar; %end; /* Populate properties macro variable, if requested */ %if not %mf_isBlank(&propertiesVar) %then %do; - /* Check for the items_properties table */ - %if ( not %mf_existds(&jsonlib..ITEMS_PROPERTIES) ) %then %do; + + /* Filter dsItems down to the properties */ + %local dsProperties; + %let dsProperties = %mf_getuniquename(prefix=dsProperties_); + data work.&dsProperties ( rename=(p3 = propertyName) ); + set work.&dsItems; + where p2="properties" and v=1; + run; + + /* Check for 1+ properties */ + %if ( %mf_nobs(&dsProperties) = 0 ) %then %do; %let &propertiesVar = %str(); %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%'); %end; %else %do; - /* Properties potentially span multiple rows in the ITEMS_PROPERTIES table */ - /* First remove some unwanted variables from the items_properties dataset. */ - %let dsTemplate=%mf_getuniquename(prefix=dsTemplate_); - data work.&dsTemplate; - stop; - set &jsonlib..ITEMS_PROPERTIES(drop=ordinal:); + /* Properties potentially span multiple rows in the input table */ + data _null_; + length + line $32767 + properties $32767 + ; + retain properties; + set &dsProperties end=last; + if _n_ = 1 then properties = '{'; + + line = cats(quote(trim(propertyName)),':'); + /* Only strings and bools appear in properties */ + if value not in ("true","false") then value = quote(trim(value)); + line = catx(' ',line,value); + /* Add a comma separator to all except the last line */ + if not last then line = cats(line,','); + + /* Add this line to the output value */ + properties = catx(' ',properties,line); + + if last then do; + /* Close off the properties object and output to the macro variable */ + properties=catx(' ',properties,'}'); + call symputx("&propertiesVar",properties); + end; run; - /* Retrieve the names of the remaining variables */ - /* These are the names of the properties. */ - %let varlist = %mf_getvarlist(work.&dsTemplate); - %if &mdebug %then %put DEBUG: &SYSMACRONAME &=varlist; - - %let &propertiesVar = %quote({); - - %let nvars = %sysfunc(countw(&varlist)); - %do i = 1 %to &nvars; - /* Use the name of each variable in the dataset as the property 'key' */ - %let key = %scan(&varlist,&i); - %let value = %mf_getvalue(&jsonlib..ITEMS_PROPERTIES,&key); - /* The data type determines if value should be quoted in the output*/ - %if %mf_getvartype(&jsonlib..ITEMS_PROPERTIES,&key) = C %then %do; - %let value = "&value"; - %end; - /* Transform the character '_', to '.' if found in the key */ - %let key = %sysfunc(translate(&key,.,_)); - /* Build the line to output */ - %let line="&key": &value; - /* ...adding a comma to all but the final line in the object */ - %if &i < &nvars %then %let line = &line%str(,); - %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME line=%quote(&line); - %let &propertiesVar = &&&propertiesVar %quote(&line); - %end; - /* Close off the properties object */ - %let &propertiesVar = &&&propertiesVar %quote(}); - %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=propertiesVar &propertiesVar=&&&propertiesVar; + %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar; %end; %end; - %if &mdebug=0 %then %do; - proc datasets library=&jsonlib nolist kill; quit; - libname &jsonlib clear; - %end; - - libname &libref1 clear; - filename &viyatypedef clear; - -%mend; \ No newline at end of file +%mend mv_getViyaFileExtParms; \ No newline at end of file From 426c0bf9f2c5af5bfd4eef36f4e2236fc81722dd Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 19 Nov 2025 00:00:14 +0000 Subject: [PATCH 04/12] chore: improved default typeDefName handling if mv_getViyaFileExtParms returns empty --- viya/mv_createfile.sas | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/viya/mv_createfile.sas b/viya/mv_createfile.sas index bc36463..6e795a5 100644 --- a/viya/mv_createfile.sas +++ b/viya/mv_createfile.sas @@ -200,7 +200,7 @@ run; %local url mimetype ext; %let url=&base_uri/files/files?parentFolderUri=&self_uri; -%let ext=%upcase(%scan(&name,-1,.)); +%let ext=%upcase(%trim(%scan(&name,-1,.))); /* Get Viya file-extension details into some macro variables */ %mv_getViyaFileExtParms(&ext @@ -220,16 +220,21 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref ct="&ctype" %end; + /* typeDefName */ %if not %mf_isBlank(&viyaTypeDefName) %then %do; url="&url%str(&)typeDefName=&viyaTypeDefName"; %end; %else %do; - %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" - or "&ext"="SVG" %then %do; - url="&url%str(&)typeDefName=file"; + %if "&ext"="HTM" or "&ext"="HTML" or "&ext"="XHTML" %then %do; + url="&url%str(&)typeDefName=file_html"; %end; %else %do; - url="&url"; + %if "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" or "&ext"="SVG" %then %do; + url="&url%str(&)typeDefName=file_%lowcase(&ext)"; + %end; + %else %do; + url="&url"; + %end; %end; %end; From 7dd25970411eea4a4e6d6669d9be8dec39cd01ed Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 19 Nov 2025 00:02:21 +0000 Subject: [PATCH 05/12] chore: amended and sorted the future Breaking Changes info --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6b6f143..ef1b40b 100644 --- a/README.md +++ b/README.md @@ -213,12 +213,13 @@ When contributing to this library, it is therefore important to ensure that all We are currently on major release v4. Breaking changes should be marked with the [deprecated](https://www.doxygen.nl/manual/commands.html#cmddeprecated) doxygen tag. The following changes are planned when the next major/breaking release (v5) becomes necessary: -* mf_getuniquelibref.sas to have the deprecated maxtried parameter removed (no longer needed) -* mp_testservice.sas to be renamed as mp_execute.sas (as it doesn't actually test anything) -* `insert_cmplib` option of mcf_xxx macros will be deprecated (the option is now checked automatically with value inserted only if needed) +* mcf_xxx macros to have `insert_cmplib` option deprecated (the option is now checked automatically with value inserted only if needed) * mcf_xxx macros to have `wrap=` option defaulted to YES for convenience. Set this option explicitly to avoid issues. -* mp_getddl.sas to be renamed to mp_ds2ddl.sas (consistent with other ds2xxx macros). A wrapper macro is already in place, and you are able to use this immediately. The default for SHOWLOG will also be YES instead of NO. +* mf_getuniquelibref.sas to have the deprecated maxtries parameter removed (no longer needed) +* mp_abort.sas will have the redundant type= parameter removed. * mp_coretable.sas will be replaced by the standalone macros in the `ddl` folder (which are already available) +* mp_getddl.sas to be renamed to mp_ds2ddl.sas (consistent with other ds2xxx macros). A wrapper macro is already in place, and you are able to use this immediately. The default for SHOWLOG will also be YES instead of NO. +* mp_testservice.sas to be renamed as mp_execute.sas (as it doesn't actually test anything) ## Star Gazing From 9d0533fe3b93efd015732bae04f4141704f0bc51 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Nov 2025 00:03:04 +0000 Subject: [PATCH 06/12] chore: updating all.sas --- all.sas | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 324 insertions(+), 24 deletions(-) diff --git a/all.sas b/all.sas index e2532e6..11ae20c 100644 --- a/all.sas +++ b/all.sas @@ -4002,10 +4002,6 @@ run; ignorelist=, outds=work.test_results )/*/STORE SOURCE*/; -%local ds test_result test_comments del add mod ilist; -%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE - SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist); - /** * this sets up the global vars, it will also enter STRICT mode. If this * behaviour is not desired, simply initiate the following global macro @@ -4013,6 +4009,10 @@ run; */ %mp_init() +%local ds test_result test_comments del add mod ilist; +%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE + SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist); + /* get current variables */ %if &action=SNAPSHOT %then %do; proc sql; @@ -24355,6 +24355,7 @@ run; @li mp_base64copy.sas @li mp_replace.sas @li mv_createfolder.sas + @li mv_getviyafileextparms.sas

Related Macros

@li mv_createfile.sas @@ -24439,7 +24440,7 @@ run; options noquotelenmax; %local base_uri; /* location of rest apis */ -%let base_uri=%mf_getplatform(VIYARESTAPI); +%let base_uri=%trim(%mf_getplatform(VIYARESTAPI)); /* create folder if it does not already exist */ %local folderds self_uri; @@ -24458,7 +24459,7 @@ run; /* abort or delete if file already exists */ %let force=%upcase(&force); %local fileuri ; -%let fileuri=%mfv_getpathuri(&path/&name); +%let fileuri=%trim(%mfv_getpathuri(&path/&name)); %mp_abort(iftrue=(%mf_isblank(&fileuri)=0 and &force ne YES) ,mac=MV_CREATEFILE ,msg=%str(File &path/&name already exists and force=&force) @@ -24485,7 +24486,13 @@ run; %local url mimetype ext; %let url=&base_uri/files/files?parentFolderUri=&self_uri; -%let ext=%upcase(%scan(&name,-1,.)); +%let ext=%upcase(%trim(%scan(&name,-1,.))); + +/* Get Viya file-extension details into some macro variables */ +%mv_getViyaFileExtParms(&ext + ,propertiesVar=viyaProperties + ,typeDefNameVar=viyaTypeDefName + ,mdebug=&mdebug); /* fetch job info */ %local fname1; @@ -24498,12 +24505,23 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref %else %do; ct="&ctype" %end; - %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" - or "&ext"="SVG" %then %do; - url="&url%str(&)typeDefName=file"; + + /* typeDefName */ + %if not %mf_isBlank(&viyaTypeDefName) %then %do; + url="&url%str(&)typeDefName=&viyaTypeDefName"; %end; %else %do; - url="&url"; + %if "&ext"="HTM" or "&ext"="HTML" or "&ext"="XHTML" %then %do; + url="&url%str(&)typeDefName=file_html"; + %end; + %else %do; + %if "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" or "&ext"="SVG" %then %do; + url="&url%str(&)typeDefName=file_%lowcase(&ext)"; + %end; + %else %do; + url="&url"; + %end; + %end; %end; headers "Accept"="application/json" @@ -24525,26 +24543,63 @@ run; ,mac=MV_CREATEFILE ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) ) -%local libref2; -%let libref2=%mf_getuniquelibref(); -libname &libref2 JSON fileref=&fname1; -/* Grab the follow on link */ -data &outds; - set &libref2..links end=last; - if rel='createChild' then do; - call symputx('href',quote(cats("&base_uri",href)),'l'); - &dbg put (_all_)(=); - end; -run; -%put &sysmacroname: %trim(&base_uri)%mfv_getpathuri(&path/&name); +/* URI of the created file */ +%let fileuri=%trim(%mfv_getpathuri(&path/&name)); + +/* If properties were found then patch the file to include them */ +%if not %mf_isBlank(&viyaProperties) %then %do; + /* Wrap the properties object in a root object also containing the file name */ + %local viyapatch; + %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_); + data _null_; + length line $32767; + file "&viyapatch" lrecl=32767; + put '{ "name": "' "&name" '",'; + line = cat('"properties": ',symget("viyaProperties")); + put line; + put '}'; + stop; + run; + + %if &mdebug=1 %then %do; + data _null_; + if (_n_ eq 1) then put 'DEBUG: ** PATCH JSON **'; + infile "&viyapatch" end=last; + input; + put _infile_; + run; + %end; + + /* And apply the properties to the newly created file, using the PATCH method */ + %let fref=%mf_getuniquefileref(); + filename &fref "&viyapatch"; + %let url=&base_uri&fileuri; + + proc http method='PATCH' oauth_bearer=sas_services in=&fref + url="&url"; + headers "Accept"="application/json" + "Content-Type"="application/json" + "If-Match"="*"; + %if &mdebug=1 %then %do; + debug level=2; + %end; + run; + %if &mdebug=1 %then %put &sysmacroname PATCH &=url + &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; + %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 200) + ,mac=MV_CREATEFILE + ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) + ) +%end; + +%put &sysmacroname: &base_uri&fileuri; %put /SASJobExecution?_file=&path/&name;%put; %if &mdebug=0 %then %do; /* clear refs */ filename &fname1 clear; filename &fref clear; - libname &libref2 clear; %end; %mp_abort( @@ -28111,6 +28166,251 @@ filename &fname1 clear; libname &libref1 clear; %mend mv_getusers;/** + @file mv_getviyafileextparms.sas + @brief Reads the VIYA file-extension type definition and returns selected + values in SAS macro variables + + @details Content is derived from the following endpoint: + "https:///types/types?filter=contains(extensions,'')" + + @param [in] ext File extension to retrieve property info for. + @param [out] propertiesVar= SAS macro variable name that will contain + the 'properties' object json, if found, else blank. + @param [out] typeDefNameVar= SAS macro variable name that will contain + the 'typeDefName' property value, if found, else blank. + @param [out] mediaTypeVar= SAS macro variable name that will contain + the 'mediaType' property value, if found, else blank. + @param [out] viyaFileExtRespLibDs (work.mv_getViyaFileExtParmsResponse) + Library.name of the dataset to receive the local working copy of the initial + response that requests all file extension details. Created once per session + to avoid multiple api calls. + @param [in] mdebug= (0) Set to 1 to enable DEBUG messages + +

SAS Macros

+ @li mf_existds.sas + @li mf_getplatform.sas + @li mf_getuniquefileref.sas + @li mf_getuniquename.sas + @li mf_getvalue.sas + @li mf_getvarlist.sas + @li mf_getvartype.sas + @li mp_abort.sas + +*/ + +%macro mv_getViyaFileExtParms( + ext, + typeDefNameVar=, + propertiesVar=, + mediaTypeVar=, + viyaFileExtRespLibDs=work.mv_getViyaFileExtParmsResponse, + mdebug=0 + ); + %local base_uri; /* location of rest apis */ + %local url; /* File extension info end-point */ + + %mp_abort( + iftrue=(%mf_isBlank(&ext)) + ,msg=%str(No file extension provided.) + ,mac=MV_GETVIYAFILEEXTPARMS + ); + + %mp_abort( + iftrue=(%mf_isBlank(&typeDefNameVar) and + %mf_isBlank(&propertiesVar) and + %mf_isBlank(&mediaTypeVar)) + ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.) + ,mac=MV_GETVIYAFILEEXTPARMS + ); + + %mp_abort( + iftrue=(%mf_isBlank(&viyaFileExtRespLibDs)) + ,msg=%str(No dataset name provided to cache inital response.) + ,mac=MV_GETVIYAFILEEXTPARMS + ); + + /* Declare requested parameters as global macro vars and initialize blank */ + %if not %mf_isBlank(&typeDefNameVar) %then %do; + %global &typeDefNameVar; + %let &typeDefNameVar = %str(); + %end; + %if not %mf_isBlank(&propertiesVar) %then %do; + %global &propertiesVar; + %let &propertiesVar = %str(); + %end; + %if not %mf_isBlank(&mediaTypeVar) %then %do; + %global &mediaTypeVar; + %let &mediaTypeVar = %str(); + %end; + + %let base_uri=%mf_getplatform(VIYARESTAPI); + %if &mdebug=1 %then %do; + %put DEBUG: &=base_uri; + %end; + + %let ext=%lowcase(&ext); + + /* Create a local copy of the Viya response containing all file type info, if + it does not already exist. */ + %if not %mf_existds(&viyaFileExtRespLibDs) %then %do; + /* Create a temp file and fill with JSON that declares */ + /* VIYA file-type details for the given file extension */ + %local viyatypedefs; + %let viyatypedefs=%mf_getuniquefileref(); + filename &viyatypedefs temp; + + %let url = &base_uri/types/types?limit=999999; + + proc http oauth_bearer=sas_services out=&viyatypedefs + url="&url"; + run; + + %if &mdebug=1 %then %put DEBUG: &sysmacroname &=url + &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE; + + %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do; + /* To avoid a breaking change, exit early if the request failed. + The calling process will proceed with empty requested macro variables. */ + %put INFO: &sysmacroname File extension details were not retrieved.; + filename &viyatypedefs clear; + %return; + %end; + + %if &mdebug=1 %then %do; + /* Dump the response to the log */ + data _null_; + length line $120; + null=byte(0); + infile &viyatypedefs dlm=null lrecl=120 recfm=n; + input line $120.; + if _n_ = 1 then put "DEBUG:"; + put line; + run; + %end; + + /* Convert the content of that JSON into SAS datasets */ + /* First prepare a new WORK-based folder to receive the datasets */ + %local jsonworkfolder jsonlib opt_dlcreatedir; + %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_); + %let jsonlib=%mf_getuniquelibref(prefix=json); + /* And point a libname at it */ + %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir)); + options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir; + + /* Read the json output once and copy datasets to its work folder */ + %local libref1; + %let libref1=%mf_getuniquelibref(); + libname &libref1 JSON fileref=&viyatypedefs automap=create; + proc copy in=&libref1 out=&jsonlib; run; + + libname &libref1 clear; + + /* Now give all rows belonging to the same items array a grouping value */ + data &viyaFileExtRespLibDs; + length _viyaItemIdx 8; + set &jsonlib..alldata; + retain _viyaItemIdx 0; + /* Increment the row group index when a new 'items' group is observed */ + if P=1 and P1='items' then _viyaItemIdx + 1; + run; + + %if &mdebug=0 %then %do; + /* Tidy up, unless debug=1 */ + proc datasets library=&jsonlib nolist kill; quit; + libname &jsonlib clear; + %end; + + filename &viyatypedefs clear; + + %end; /* If initial filetype query response didn't exist */ + + /* Find the row-group for the current file extension */ + %local itemRowGroup; + %let itemRowGroup = + %mf_getValue( + &viyaFileExtRespLibDs + ,_viyaItemIdx + ,filter=%quote(p1='items' and p2='extensions' and value="&ext") + ); + + %if &mdebug %then %put DEBUG: &=itemRowGroup; + + %if %mf_isBlank(&itemRowGroup) %then %do; + /* extension was not found */ + %if(&mdebug=1) %then %put DEBUG: No type details found for extension "&ext".; + %return; + %end; + + /* Filter the cached response data down to the required file extension */ + %local dsItems; + %let dsItems = %mf_getuniquename(prefix=dsItems_); + data work.&dsItems; + set &viyaFileExtRespLibDs; + where _viyaItemIdx = &itemRowGroup; + run; + + /* Populate typeDefName, if requested */ + %if (not %mf_isBlank(&typeDefNameVar)) %then %do; + %let &typeDefNameVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="name")); + %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar; + %end; + + /* Populate mediaType, if requested */ + %if (not %mf_isBlank(&mediaTypeVar)) %then %do; + %let &mediaTypeVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="mediaType")); + %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar; + %end; + + /* Populate properties macro variable, if requested */ + %if not %mf_isBlank(&propertiesVar) %then %do; + + /* Filter dsItems down to the properties */ + %local dsProperties; + %let dsProperties = %mf_getuniquename(prefix=dsProperties_); + data work.&dsProperties ( rename=(p3 = propertyName) ); + set work.&dsItems; + where p2="properties" and v=1; + run; + + /* Check for 1+ properties */ + %if ( %mf_nobs(&dsProperties) = 0 ) %then %do; + %let &propertiesVar = %str(); + %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%'); + %end; + %else %do; + /* Properties potentially span multiple rows in the input table */ + data _null_; + length + line $32767 + properties $32767 + ; + retain properties; + set &dsProperties end=last; + if _n_ = 1 then properties = '{'; + + line = cats(quote(trim(propertyName)),':'); + /* Only strings and bools appear in properties */ + if value not in ("true","false") then value = quote(trim(value)); + line = catx(' ',line,value); + /* Add a comma separator to all except the last line */ + if not last then line = cats(line,','); + + /* Add this line to the output value */ + properties = catx(' ',properties,line); + + if last then do; + /* Close off the properties object and output to the macro variable */ + properties=catx(' ',properties,'}'); + call symputx("&propertiesVar",properties); + end; + run; + + %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar; + %end; + + %end; + +%mend mv_getViyaFileExtParms;/** @file @brief Executes a SAS Viya Job @details Triggers a SAS Viya Job, with optional URL parameters, using From b6f020e897874bb32fbe1c391b2de3062bd63694 Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 19 Nov 2025 01:00:21 +0000 Subject: [PATCH 07/12] fix: corrected syntax and amended included macros --- viya/mv_createfile.sas | 2 +- viya/mv_getviyafileextparms.sas | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/viya/mv_createfile.sas b/viya/mv_createfile.sas index 6e795a5..7806e63 100644 --- a/viya/mv_createfile.sas +++ b/viya/mv_createfile.sas @@ -262,7 +262,7 @@ run; %let fileuri=%trim(%mfv_getpathuri(&path/&name)); /* If properties were found then patch the file to include them */ -%if not %mf_isBlank(&viyaProperties) %then %do; +%if not %mf_isBlank(%superq(viyaProperties)) %then %do; /* Wrap the properties object in a root object also containing the file name */ %local viyapatch; %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_); diff --git a/viya/mv_getviyafileextparms.sas b/viya/mv_getviyafileextparms.sas index f7f40ab..50baa38 100644 --- a/viya/mv_getviyafileextparms.sas +++ b/viya/mv_getviyafileextparms.sas @@ -4,7 +4,7 @@ values in SAS macro variables @details Content is derived from the following endpoint: - "https:///types/types?filter=contains(extensions,'')" + "https://${serverUrl}/types/types?limit=999999" @param [in] ext File extension to retrieve property info for. @param [out] propertiesVar= SAS macro variable name that will contain @@ -27,6 +27,7 @@ @li mf_getvalue.sas @li mf_getvarlist.sas @li mf_getvartype.sas + @li mf_nobs.sas @li mp_abort.sas */ From f71681c3521e955bd4c2c08c306b46a2dd0914d2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Nov 2025 01:01:44 +0000 Subject: [PATCH 08/12] chore: updating all.sas --- all.sas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/all.sas b/all.sas index 11ae20c..e3b8271 100644 --- a/all.sas +++ b/all.sas @@ -24548,7 +24548,7 @@ run; %let fileuri=%trim(%mfv_getpathuri(&path/&name)); /* If properties were found then patch the file to include them */ -%if not %mf_isBlank(&viyaProperties) %then %do; +%if not %mf_isBlank(%superq(viyaProperties)) %then %do; /* Wrap the properties object in a root object also containing the file name */ %local viyapatch; %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_); @@ -28171,7 +28171,7 @@ libname &libref1 clear; values in SAS macro variables @details Content is derived from the following endpoint: - "https:///types/types?filter=contains(extensions,'')" + "https://${serverUrl}/types/types?limit=999999" @param [in] ext File extension to retrieve property info for. @param [out] propertiesVar= SAS macro variable name that will contain @@ -28194,6 +28194,7 @@ libname &libref1 clear; @li mf_getvalue.sas @li mf_getvarlist.sas @li mf_getvartype.sas + @li mf_nobs.sas @li mp_abort.sas */ From 9bf2870357a89c8fb49b7d9df76520ece15c7e0a Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 19 Nov 2025 01:42:23 +0000 Subject: [PATCH 09/12] fix: returned the overzealous removal of &outds creation --- viya/mv_createfile.sas | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/viya/mv_createfile.sas b/viya/mv_createfile.sas index 7806e63..6778910 100644 --- a/viya/mv_createfile.sas +++ b/viya/mv_createfile.sas @@ -258,6 +258,17 @@ run; ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) ) +%local libref2; +%let libref2=%mf_getuniquelibref(); +libname &libref2 JSON fileref=&fname1; +/* Grab the follow on link */ +data &outds; + set &libref2..links end=last; + if rel='createChild' then do; + &dbg put (_all_)(=); + end; +run; + /* URI of the created file */ %let fileuri=%trim(%mfv_getpathuri(&path/&name)); @@ -314,6 +325,7 @@ run; /* clear refs */ filename &fname1 clear; filename &fref clear; + libname &libref2 clear; %end; %mp_abort( From b3298143c7e557d9e8f002618418837f6ce8fc57 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Nov 2025 01:43:18 +0000 Subject: [PATCH 10/12] chore: updating all.sas --- all.sas | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/all.sas b/all.sas index e3b8271..7a0a9c5 100644 --- a/all.sas +++ b/all.sas @@ -24544,6 +24544,17 @@ run; ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE) ) +%local libref2; +%let libref2=%mf_getuniquelibref(); +libname &libref2 JSON fileref=&fname1; +/* Grab the follow on link */ +data &outds; + set &libref2..links end=last; + if rel='createChild' then do; + &dbg put (_all_)(=); + end; +run; + /* URI of the created file */ %let fileuri=%trim(%mfv_getpathuri(&path/&name)); @@ -24600,6 +24611,7 @@ run; /* clear refs */ filename &fname1 clear; filename &fref clear; + libname &libref2 clear; %end; %mp_abort( From b49ac96766559c54380c5137bfd68c78767c051d Mon Sep 17 00:00:00 2001 From: Trevor Moody Date: Wed, 19 Nov 2025 11:56:16 +0000 Subject: [PATCH 11/12] chore: added macrovars to exclude from compare test --- tests/viyaonly/mv_getviyafileextparms.test.sas | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/viyaonly/mv_getviyafileextparms.test.sas b/tests/viyaonly/mv_getviyafileextparms.test.sas index d99887e..2aa665a 100644 --- a/tests/viyaonly/mv_getviyafileextparms.test.sas +++ b/tests/viyaonly/mv_getviyafileextparms.test.sas @@ -13,7 +13,8 @@ options mprint; %let mvarIgnoreList = - MC0_JADP1LEN MC0_JADP2LEN MC0_JADP3LEN MC0_JADPNUM MC0_JADVLEN; + MC0_JADP1LEN MC0_JADP2LEN MC0_JADP3LEN MC0_JADPNUM MC0_JADVLEN + SASJSPROCESSMODE SASJS_STPSRV_HEADER_LOC; %put TEST 1 - Test with common extension, requesting only typeDefName parameter; %mp_assertscope(SNAPSHOT) From c15e7db1c6e931633013480e0e3b6bf8d59369fd Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Nov 2025 12:00:41 +0000 Subject: [PATCH 12/12] chore: updating all.sas