|
1811 | 1811 | "max":20,
|
1812 | 1812 | "min":0
|
1813 | 1813 | },
|
| 1814 | + "EvaluationBedrockKnowledgeBaseIdentifiers":{ |
| 1815 | + "type":"list", |
| 1816 | + "member":{"shape":"KnowledgeBaseId"}, |
| 1817 | + "max":1, |
| 1818 | + "min":0 |
| 1819 | + }, |
1814 | 1820 | "EvaluationBedrockModel":{
|
1815 | 1821 | "type":"structure",
|
1816 | 1822 | "required":["modelIdentifier"],
|
1817 | 1823 | "members":{
|
1818 |
| - "modelIdentifier":{"shape":"EvaluationModelIdentifier"}, |
| 1824 | + "modelIdentifier":{"shape":"EvaluationBedrockModelIdentifier"}, |
1819 | 1825 | "inferenceParams":{"shape":"EvaluationModelInferenceParams"},
|
1820 | 1826 | "performanceConfig":{"shape":"PerformanceConfiguration"}
|
1821 | 1827 | }
|
1822 | 1828 | },
|
| 1829 | + "EvaluationBedrockModelIdentifier":{ |
| 1830 | + "type":"string", |
| 1831 | + "max":2048, |
| 1832 | + "min":1, |
| 1833 | + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:application-inference-profile/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z-]{2,8}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([0-9]{12}:(default-prompt-router|prompt-router)/[a-zA-Z0-9-:.]+)))|(([a-z]{2}[.]{1})([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|arn:aws(-[^:]+)?:sagemaker:[a-z0-9-]{1,20}:[0-9]{12}:endpoint/[a-z0-9-]{1,63}" |
| 1834 | + }, |
| 1835 | + "EvaluationBedrockModelIdentifiers":{ |
| 1836 | + "type":"list", |
| 1837 | + "member":{"shape":"EvaluationBedrockModelIdentifier"}, |
| 1838 | + "max":2, |
| 1839 | + "min":0 |
| 1840 | + }, |
1823 | 1841 | "EvaluationConfig":{
|
1824 | 1842 | "type":"structure",
|
1825 | 1843 | "members":{
|
|
1877 | 1895 | },
|
1878 | 1896 | "union":true
|
1879 | 1897 | },
|
| 1898 | + "EvaluationInferenceConfigSummary":{ |
| 1899 | + "type":"structure", |
| 1900 | + "members":{ |
| 1901 | + "modelConfigSummary":{"shape":"EvaluationModelConfigSummary"}, |
| 1902 | + "ragConfigSummary":{"shape":"EvaluationRagConfigSummary"} |
| 1903 | + } |
| 1904 | + }, |
1880 | 1905 | "EvaluationJobArn":{
|
1881 | 1906 | "type":"string",
|
1882 | 1907 | "max":1011,
|
|
1950 | 1975 | "EvaluationModelConfig":{
|
1951 | 1976 | "type":"structure",
|
1952 | 1977 | "members":{
|
1953 |
| - "bedrockModel":{"shape":"EvaluationBedrockModel"} |
| 1978 | + "bedrockModel":{"shape":"EvaluationBedrockModel"}, |
| 1979 | + "precomputedInferenceSource":{"shape":"EvaluationPrecomputedInferenceSource"} |
1954 | 1980 | },
|
1955 | 1981 | "union":true
|
1956 | 1982 | },
|
| 1983 | + "EvaluationModelConfigSummary":{ |
| 1984 | + "type":"structure", |
| 1985 | + "members":{ |
| 1986 | + "bedrockModelIdentifiers":{"shape":"EvaluationBedrockModelIdentifiers"}, |
| 1987 | + "precomputedInferenceSourceIdentifiers":{"shape":"EvaluationPrecomputedInferenceSourceIdentifiers"} |
| 1988 | + } |
| 1989 | + }, |
1957 | 1990 | "EvaluationModelConfigs":{
|
1958 | 1991 | "type":"list",
|
1959 | 1992 | "member":{"shape":"EvaluationModelConfig"},
|
1960 | 1993 | "max":2,
|
1961 | 1994 | "min":1
|
1962 | 1995 | },
|
1963 |
| - "EvaluationModelIdentifier":{ |
| 1996 | + "EvaluationModelInferenceParams":{ |
1964 | 1997 | "type":"string",
|
1965 |
| - "max":2048, |
| 1998 | + "max":1023, |
1966 | 1999 | "min":1,
|
1967 |
| - "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:imported-model/[a-z0-9]{12})|([0-9]{12}:application-inference-profile/[a-z0-9]{12})|([0-9]{12}:inference-profile/(([a-z-]{2,8}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([0-9]{12}:(default-prompt-router|prompt-router)/[a-zA-Z0-9-:.]+)))|(([a-z]{2}[.]{1})([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|arn:aws(-[^:]+)?:sagemaker:[a-z0-9-]{1,20}:[0-9]{12}:endpoint/[a-z0-9-]{1,63}" |
| 2000 | + "sensitive":true |
| 2001 | + }, |
| 2002 | + "EvaluationOutputDataConfig":{ |
| 2003 | + "type":"structure", |
| 2004 | + "required":["s3Uri"], |
| 2005 | + "members":{ |
| 2006 | + "s3Uri":{"shape":"S3Uri"} |
| 2007 | + } |
1968 | 2008 | },
|
1969 |
| - "EvaluationModelIdentifiers":{ |
| 2009 | + "EvaluationPrecomputedInferenceSource":{ |
| 2010 | + "type":"structure", |
| 2011 | + "required":["inferenceSourceIdentifier"], |
| 2012 | + "members":{ |
| 2013 | + "inferenceSourceIdentifier":{"shape":"EvaluationPrecomputedInferenceSourceIdentifier"} |
| 2014 | + } |
| 2015 | + }, |
| 2016 | + "EvaluationPrecomputedInferenceSourceIdentifier":{ |
| 2017 | + "type":"string", |
| 2018 | + "max":256, |
| 2019 | + "min":1, |
| 2020 | + "pattern":"[a-zA-Z0-9]([a-zA-Z0-9._-]){0,255}" |
| 2021 | + }, |
| 2022 | + "EvaluationPrecomputedInferenceSourceIdentifiers":{ |
1970 | 2023 | "type":"list",
|
1971 |
| - "member":{"shape":"EvaluationModelIdentifier"}, |
| 2024 | + "member":{"shape":"EvaluationPrecomputedInferenceSourceIdentifier"}, |
1972 | 2025 | "max":2,
|
1973 | 2026 | "min":0
|
1974 | 2027 | },
|
1975 |
| - "EvaluationModelInferenceParams":{ |
| 2028 | + "EvaluationPrecomputedRagSourceConfig":{ |
| 2029 | + "type":"structure", |
| 2030 | + "members":{ |
| 2031 | + "retrieveSourceConfig":{"shape":"EvaluationPrecomputedRetrieveSourceConfig"}, |
| 2032 | + "retrieveAndGenerateSourceConfig":{"shape":"EvaluationPrecomputedRetrieveAndGenerateSourceConfig"} |
| 2033 | + }, |
| 2034 | + "union":true |
| 2035 | + }, |
| 2036 | + "EvaluationPrecomputedRagSourceIdentifier":{ |
1976 | 2037 | "type":"string",
|
1977 |
| - "max":1023, |
| 2038 | + "max":256, |
1978 | 2039 | "min":1,
|
1979 |
| - "sensitive":true |
| 2040 | + "pattern":"[a-zA-Z0-9]([a-zA-Z0-9._-]){0,255}" |
1980 | 2041 | },
|
1981 |
| - "EvaluationOutputDataConfig":{ |
| 2042 | + "EvaluationPrecomputedRagSourceIdentifiers":{ |
| 2043 | + "type":"list", |
| 2044 | + "member":{"shape":"EvaluationPrecomputedRagSourceIdentifier"}, |
| 2045 | + "max":1, |
| 2046 | + "min":0 |
| 2047 | + }, |
| 2048 | + "EvaluationPrecomputedRetrieveAndGenerateSourceConfig":{ |
1982 | 2049 | "type":"structure",
|
1983 |
| - "required":["s3Uri"], |
| 2050 | + "required":["ragSourceIdentifier"], |
1984 | 2051 | "members":{
|
1985 |
| - "s3Uri":{"shape":"S3Uri"} |
| 2052 | + "ragSourceIdentifier":{"shape":"EvaluationPrecomputedRagSourceIdentifier"} |
| 2053 | + } |
| 2054 | + }, |
| 2055 | + "EvaluationPrecomputedRetrieveSourceConfig":{ |
| 2056 | + "type":"structure", |
| 2057 | + "required":["ragSourceIdentifier"], |
| 2058 | + "members":{ |
| 2059 | + "ragSourceIdentifier":{"shape":"EvaluationPrecomputedRagSourceIdentifier"} |
| 2060 | + } |
| 2061 | + }, |
| 2062 | + "EvaluationRagConfigSummary":{ |
| 2063 | + "type":"structure", |
| 2064 | + "members":{ |
| 2065 | + "bedrockKnowledgeBaseIdentifiers":{"shape":"EvaluationBedrockKnowledgeBaseIdentifiers"}, |
| 2066 | + "precomputedRagSourceIdentifiers":{"shape":"EvaluationPrecomputedRagSourceIdentifiers"} |
1986 | 2067 | }
|
1987 | 2068 | },
|
1988 | 2069 | "EvaluationRatingMethod":{
|
|
2014 | 2095 | "creationTime":{"shape":"Timestamp"},
|
2015 | 2096 | "jobType":{"shape":"EvaluationJobType"},
|
2016 | 2097 | "evaluationTaskTypes":{"shape":"EvaluationTaskTypes"},
|
2017 |
| - "modelIdentifiers":{"shape":"EvaluationModelIdentifiers"}, |
2018 |
| - "ragIdentifiers":{"shape":"RAGIdentifiers"}, |
| 2098 | + "modelIdentifiers":{ |
| 2099 | + "shape":"EvaluationBedrockModelIdentifiers", |
| 2100 | + "deprecated":true, |
| 2101 | + "deprecatedMessage":"Inference identifiers should be retrieved from the inferenceConfigSummary" |
| 2102 | + }, |
| 2103 | + "ragIdentifiers":{ |
| 2104 | + "shape":"EvaluationBedrockKnowledgeBaseIdentifiers", |
| 2105 | + "deprecated":true, |
| 2106 | + "deprecatedMessage":"Inference identifiers should be retrieved from the inferenceConfigSummary" |
| 2107 | + }, |
2019 | 2108 | "evaluatorModelIdentifiers":{"shape":"EvaluatorModelIdentifiers"},
|
| 2109 | + "inferenceConfigSummary":{"shape":"EvaluationInferenceConfigSummary"}, |
2020 | 2110 | "applicationType":{"shape":"ApplicationType"}
|
2021 | 2111 | }
|
2022 | 2112 | },
|
|
2050 | 2140 | "type":"string",
|
2051 | 2141 | "max":2048,
|
2052 | 2142 | "min":1,
|
2053 |
| - "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}$|(^[a-z0-9-]+[.][a-z0-9-]+([.][a-z0-9-]+)*(:[a-z0-9-]+)?$)|^[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12}|)" |
| 2143 | + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:((:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:inference-profile/(([a-z-]{2,8}.)[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63})))))$|(^[a-z0-9-]+[.][a-z0-9-]+([.][a-z0-9-]+)*(:[a-z0-9-]+)?$)|^[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12}|)" |
2054 | 2144 | },
|
2055 | 2145 | "EvaluatorModelIdentifiers":{
|
2056 | 2146 | "type":"list",
|
|
4386 | 4476 | "type":"string",
|
4387 | 4477 | "max":2048,
|
4388 | 4478 | "min":1,
|
4389 |
| - "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-:]{1,63}/[a-z0-9]{12}$)|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}$)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)" |
| 4479 | + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-:]{1,63}/[a-z0-9]{12}$)|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)$)|([0-9]{12}:(inference-profile|application-inference-profile)/[a-zA-Z0-9-:.]+$)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)" |
4390 | 4480 | },
|
4391 | 4481 | "ModelIdentifier":{
|
4392 | 4482 | "type":"string",
|
|
4780 | 4870 | "RAGConfig":{
|
4781 | 4871 | "type":"structure",
|
4782 | 4872 | "members":{
|
4783 |
| - "knowledgeBaseConfig":{"shape":"KnowledgeBaseConfig"} |
| 4873 | + "knowledgeBaseConfig":{"shape":"KnowledgeBaseConfig"}, |
| 4874 | + "precomputedRagSourceConfig":{"shape":"EvaluationPrecomputedRagSourceConfig"} |
4784 | 4875 | },
|
4785 | 4876 | "union":true
|
4786 | 4877 | },
|
4787 |
| - "RAGIdentifiers":{ |
4788 |
| - "type":"list", |
4789 |
| - "member":{"shape":"KnowledgeBaseId"}, |
4790 |
| - "max":1, |
4791 |
| - "min":0 |
4792 |
| - }, |
4793 | 4878 | "RAGStopSequences":{
|
4794 | 4879 | "type":"list",
|
4795 | 4880 | "member":{"shape":"RAGStopSequencesMemberString"},
|
|
0 commit comments