Skip to content

feat(modelarmor): modelarmor update template with labels #5278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from

Conversation

tirthrajsinh-zala-crest
Copy link

@tirthrajsinh-zala-crest tirthrajsinh-zala-crest commented Apr 11, 2025

Description

Added code snippet for update modelarmor template with labels

Checklist

  • I have followed Contributing Guidelines from CONTRIBUTING.MD
  • Tests pass: go test -v ./.. (see Testing)
  • Code formatted: gofmt (see Formatting)
  • Vetting pass: go vet (see Formatting)
  • These samples need a new API enabled in testing projects to pass (let us know which ones)
  • These samples need a new/updated env vars in testing projects set to pass (let us know which ones)
  • This sample adds a new sample directory, and I updated the CODEOWNERS file with the codeowners for this sample
  • This sample adds a new Product API, and I updated the Blunderbuss issue/PR auto-assigner with the codeowners for this sample
  • Please merge this PR for me once it is approved

@product-auto-label product-auto-label bot added the samples Issues that are directly related to samples. label Apr 11, 2025
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @tirthrajsinh-zala-crest, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

Summary of Changes

This pull request introduces code snippets for creating, getting, and updating Model Armor templates with labels in the golang-samples repository. It adds new files for these operations under the modelarmor directory and includes necessary modifications to the go.mod and go.work files to incorporate the new module. The changes also include a test case to verify the functionality of updating template labels.

Highlights

  • New Module: A new modelarmor module is added to the golang-samples repository, containing code for interacting with Model Armor templates.
  • Create Template: The create_template.go file provides a function to create a new Model Armor template with specified filters.
  • Get Template: The get_template.go file implements a function to retrieve an existing Model Armor template.
  • Update Template Labels: The update_template_labels.go file contains a function to update the labels of a Model Armor template.
  • Test Case: A test case TestUpdateTemplateLabels is added in modelarmor_test.go to verify the functionality of updating template labels.

Changelog

Click here to see the changelog
  • go.work
    • Added the ./modelarmor directory to the go.work file to include it in the workspace.
  • modelarmor/create_template.go
    • Created a new file create_template.go with a function createModelArmorTemplate to create a Model Armor template.
    • The function takes projectID, location, and templateID as input.
    • It sets up default filters for PiAndJailbreakFilterSettings and MaliciousUriFilterSettings.
    • It prints the created template name to the provided io.Writer.
  • modelarmor/get_template.go
    • Created a new file get_template.go with a function getModelArmorTemplate to retrieve a Model Armor template.
    • The function takes projectID, location, and templateID as input.
    • It prints the retrieved template name to the provided io.Writer.
  • modelarmor/go.mod
    • Created a new file go.mod to define the module's dependencies.
    • It includes dependencies such as cloud.google.com/go/modelarmor, google.golang.org/api, and google.golang.org/grpc.
  • modelarmor/go.sum
    • Created a new file go.sum to track the dependencies' checksums.
  • modelarmor/modelarmor_test.go
    • Created a new file modelarmor_test.go with a test case TestUpdateTemplateLabels.
    • The test case creates a template, updates its labels, and verifies the updated labels.
    • Helper functions testLocation, testClient, and testCleanupTemplate are defined for testing purposes.
  • modelarmor/testdata/env/test.env
    • Created a new file test.env to store the environment variables for testing.
    • It includes GOLANG_SAMPLES_ORGANIZATION_ID and GOLANG_SAMPLES_FOLDER_ID.
  • modelarmor/update_template_labels.go
    • Created a new file update_template_labels.go with a function updateModelArmorTemplateLabels to update the labels of a Model Armor template.
    • The function takes projectID, locationID, templateID, and labels as input.
    • It uses a FieldMask to update only the labels field.
    • It prints the updated template name to the provided io.Writer.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.


In realms of code, where templates reside,
Model Armor's strength, our digital guide.
With labels aligned, and filters in place,
Security's embrace, a fortified space.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

The pull request introduces new functionalities for creating, getting, and updating Model Armor templates with labels. The code is well-structured and includes necessary error handling. However, there are a few areas that could be improved for clarity and efficiency.

Summary of Findings

  • Error message consistency: The error messages in create_template.go and get_template.go use slightly different formats. Maintaining consistency in error message formatting improves readability and maintainability.
  • Redundant filter documentation: The filter documentation link is repeated in both create_template.go and update_template_labels.go. Consider centralizing this documentation or using a constant for the URL to avoid duplication.
  • Missing tests for edge cases: The test case in modelarmor_test.go only covers the successful update of labels. Adding tests for edge cases, such as updating with an empty label map or invalid template IDs, would improve the robustness of the code.

Merge Readiness

The pull request is almost ready for merging. Addressing the error message consistency and redundant documentation would improve the code quality. Additionally, adding more test cases would increase confidence in the code's reliability. I am unable to approve this pull request, and recommend that others review and approve this code before merging.

option.WithEndpoint(fmt.Sprintf("modelarmor.%s.rep.googleapis.com:443", location)),
)
if err != nil {
return nil, fmt.Errorf("failed to create client for project %s, location %s: %v", projectID, location, err)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider using a consistent error message format across all functions. For example, you could use fmt.Errorf("CreateTemplate: failed to create client: %w", err) to provide more context and enable easier error tracking.

Suggested change
return nil, fmt.Errorf("failed to create client for project %s, location %s: %v", projectID, location, err)
return nil, fmt.Errorf("CreateTemplate: failed to create client for project %s, location %s: %w", projectID, location, err)

option.WithEndpoint(fmt.Sprintf("modelarmor.%s.rep.googleapis.com:443", location)),
)
if err != nil {
return nil, fmt.Errorf("failed to create client for project %s, location %s: %v", projectID, location, err)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency, use the same error message format as in create_template.go. This helps in debugging and maintaining the codebase.

Suggested change
return nil, fmt.Errorf("failed to create client for project %s, location %s: %v", projectID, location, err)
return nil, fmt.Errorf("GetTemplate: failed to create client for project %s, location %s: %w", projectID, location, err)

Comment on lines 94 to 96
if _, err := updateModelArmorTemplateLabels(&b, tc.ProjectID, "us-central1", templateID, map[string]string{"testkey": "testvalue"}); err != nil {
t.Fatal(err)
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider adding test cases for edge cases, such as updating with an empty label map or using an invalid template ID. This would ensure the function handles unexpected inputs gracefully.

@tirthrajsinh-zala-crest tirthrajsinh-zala-crest marked this pull request as ready for review April 11, 2025 13:24
@tirthrajsinh-zala-crest tirthrajsinh-zala-crest requested review from a team as code owners April 11, 2025 13:24
Copy link

snippet-bot bot commented Apr 11, 2025

Here is the summary of changes.

You are about to add 1 region tag.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

Copy link
Collaborator

@telpirion telpirion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR has the same issues as #5273 . Please address the global issues and re-open when ready for review.

@telpirion telpirion self-assigned this Apr 11, 2025
@telpirion telpirion marked this pull request as draft April 11, 2025 18:12
@tirthrajsinh-zala-crest tirthrajsinh-zala-crest marked this pull request as ready for review April 14, 2025 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
samples Issues that are directly related to samples.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants