Merge pull request #710 from apigee/issue709

feat: LLM Operations and Token in API Product config

Author: ssvaidyanathan

internal/client/products/products.go

@@ -58,6 +58,10 @@ type APIProduct struct {
 	Scopes                []string               `json:"scopes,omitempty"`
 	QuotaCounterScope     string                 `json:"quotaCounterScope,omitempty"`
 	Space                 string                 `json:"space,omitempty"`
+	LlmQuota              string                 `json:"llmQuota,omitempty"`
+	LlmQuotaInterval      string                 `json:"llmQuotaInterval,omitempty"`
+	LlmQuotaTimeUnit	  string				 `json:"llmQuotaTimeUnit,omitempty"`
+	LlmOperationGroup	  *LlmOperationGroup	 `json:"llmOperationGroup,omitempty"`
 }
 
 type OperationGroup struct {
@@ -72,7 +76,10 @@ type GraphqlOperationGroup struct {
 
 type GrpcOperationGroup struct {
 	OperationConfigs    []grpcOperationConfig `json:"operationConfigs,omitempty"`
-	OperationConfigType string                `json:"operationConfigType,omitempty"`
+}
+
+type LlmOperationGroup struct {
+	OperationConfigs    []llmOperationConfig  `json:"operationConfigs,omitempty"`
 }
 
 type operationConfig struct {
@@ -97,6 +104,13 @@ type grpcOperationConfig struct {
 	Attributes []Attribute `json:"attributes,omitempty"`
 }
 
+type llmOperationConfig struct {
+	APISource  string             `json:"apiSource,omitempty"`
+	Operations []llmOperation 	  `json:"llmOperations,omitempty"`
+	Quota      *quota             `json:"llmTokenQuota,omitempty"`
+	Attributes []Attribute        `json:"attributes,omitempty"`
+}
+
 type operation struct {
 	Resource string   `json:"resource,omitempty"`
 	Methods  []string `json:"methods,omitempty"`
@@ -107,6 +121,12 @@ type graphQLoperation struct {
 	Operation      string   `json:"operation,omitempty"`
 }
 
+type llmOperation struct {
+	Resource string   `json:"resource,omitempty"`
+	Methods  []string `json:"methods,omitempty"`
+	Model	 string   `json:"model,omitempty"`
+}
+
 type quota struct {
 	Limit    string `json:"limit,omitempty"`
 	Interval string `json:"interval,omitempty"`

internal/cmd/products/crtprod.go

@@ -68,6 +68,14 @@ var CreateCmd = &cobra.Command{
 			return nil
 		}
 
+		p.LlmQuota = llmQuota
+		p.LlmQuotaInterval = llmQuotaInterval
+		p.LlmQuotaTimeUnit = llmQuotaUnit
+		p.LlmOperationGroup, err = getLlmOperationGroup(llmOperationGroupFile)
+		if err != nil {
+			return nil
+		}
+
 		p.Attributes = getAttributes(attrs)
 
 		if quotaCounterScope != "" {
@@ -82,10 +90,12 @@ var CreateCmd = &cobra.Command{
 ` + GetExample(0) + `
 
 Create an API product, using externally defined operations, with auto approval and access=public, and a quota of 100/minute:
-` + GetExample(1),
+` + GetExample(1)+ `
+Create an API product, using externally defined LLM operations, with auto approval and access=public, and an LLM quota of 1000/minute:
+` + GetExample(5),
 }
 
-var operationGroupFile, gqlOperationGroupFile, grpcOperationGroupFile, quotaCounterScope string
+var operationGroupFile, gqlOperationGroupFile, grpcOperationGroupFile, llmOperationGroupFile, quotaCounterScope string
 
 func init() {
 	CreateCmd.Flags().StringVarP(&name, "name", "n",
@@ -120,6 +130,14 @@ func init() {
 		"", "Scope of the quota decides how the quota counter gets applied; can be PROXY or OPERATION")
 	CreateCmd.Flags().StringVarP(&space, "space", "",
 		"", "Apigee Space to associate to")
+	CreateCmd.Flags().StringVarP(&llmQuota, "llm-quota", "",
+		"", "LLM Quota Amount")
+	CreateCmd.Flags().StringVarP(&llmQuotaInterval, "llm-quota-interval", "",
+		"", "LLM Quota Interval")
+	CreateCmd.Flags().StringVarP(&llmQuotaUnit, "llm-quota-timeunit", "",
+		"", "LLM Quota Unit")
+	CreateCmd.Flags().StringVarP(&llmOperationGroupFile, "llmopgrp", "",
+		"", "File containing LLM Operation Group JSON. See samples for how to create the file")
 	// TODO: apiresource -r later
 
 	_ = CreateCmd.MarkFlagRequired("name")

internal/cmd/products/products.go

@@ -37,7 +37,7 @@ var (
 )
 
 var (
-	description, approval, displayName, quota, quotaInterval, quotaUnit, space string
+	description, approval, displayName, quota, quotaInterval, quotaUnit, llmQuota, llmQuotaInterval, llmQuotaUnit, space string
 	environments, proxies, scopes                                              []string
 	attrs                                                                      map[string]string
 )
@@ -61,6 +61,16 @@ var examples = []string{
 	`apigeecli products import -f samples/apiproduct-legacy.json  --default-token`,
 	`apigeecli products import -f samples/apiproduct-gqlgroup.json  --default-token`,
 	`apigeecli products import -f samples/apiproduct-op-group.json  --default-token`,
+	`apigeecli products create --name $product_name \
+--display-name $product_name \
+--llmopgrp $ops_file \
+--llm-quota=1000 \
+--llm-quota-interval=1 \
+--llm-quota-timeunit=minute \
+--envs $env \
+--space $space \
+--approval auto \
+--attrs access=public  --default-token`,
 }
 
 func init() {
@@ -141,6 +151,26 @@ func getGrpcOperationGroup(grpcOperationGroupFile string) (*products.GrpcOperati
 	return nil, nil
 }
 
+func getLlmOperationGroup(llmOperationGroupFile string) (*products.LlmOperationGroup, error) {
+	var llmOperationGrpBytes []byte
+	var err error
+
+	llmOperationGrp := products.LlmOperationGroup{}
+
+	if llmOperationGroupFile != "" {
+		if llmOperationGrpBytes, err = os.ReadFile(llmOperationGroupFile); err != nil {
+			clilog.Debug.Println(err)
+			return nil, err
+		}
+		if err = json.Unmarshal(llmOperationGrpBytes, &llmOperationGrp); err != nil {
+			clilog.Debug.Println(err)
+			return nil, err
+		}
+		return &llmOperationGrp, nil
+	}
+	return nil, nil
+}
+
 func getAttributes(attrs map[string]string) []products.Attribute {
 	var attributes []products.Attribute
 

internal/cmd/products/updprod.go

@@ -68,6 +68,14 @@ var UpdateCmd = &cobra.Command{
 			return nil
 		}
 
+		p.LlmQuota = llmQuota
+		p.LlmQuotaInterval = llmQuotaInterval
+		p.LlmQuotaTimeUnit = llmQuotaUnit
+		p.LlmOperationGroup, err = getLlmOperationGroup(llmOperationGroupFile)
+		if err != nil {
+			return nil
+		}
+
 		p.Attributes = getAttributes(attrs)
 
 		if quotaCounterScope != "" {
@@ -113,6 +121,14 @@ func init() {
 		"", "Scope of the quota decides how the quota counter gets applied; can be PROXY or OPERATION")
 	UpdateCmd.Flags().StringVarP(&space, "space", "",
 		"", "Associated Apigee Space. Pass this if the API Product being updated is part of a space")
+	UpdateCmd.Flags().StringVarP(&llmQuota, "llm-quota", "",
+		"", "LLM Quota Amount")
+	UpdateCmd.Flags().StringVarP(&llmQuotaInterval, "llm-quota-interval", "",
+		"", "LLM Quota Interval")
+	UpdateCmd.Flags().StringVarP(&llmQuotaUnit, "llm-quota-timeunit", "",
+		"", "LLM Quota Unit")
+	UpdateCmd.Flags().StringVarP(&llmOperationGroupFile, "llmopgrp", "",
+		"", "File containing LLM Operation Group JSON. See samples for how to create the file")
 	// TODO: apiresource -r later
 
 	_ = UpdateCmd.MarkFlagRequired("name")

test/apiproduct-llmop-group.json

@@ -0,0 +1,27 @@
+{
+  "operationConfigs": [
+    {
+      "apiSource": "httpbin",
+      "llmOperations": [
+        {
+          "resource": "/httpbin",
+          "methods": [
+            "POST"
+          ],
+          "model": "gemini-2.5-flash"
+        }
+      ],
+      "llmTokenQuota": {
+        "limit": "100",
+        "interval": "5",
+        "timeUnit": "minute"
+      },
+      "attributes": [
+        {
+          "name": "key1",
+          "value": "value1"
+        }
+      ]
+    }
+  ]
+}