Skip to content
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

Search Renames / Regen #11342

Merged
merged 21 commits into from
May 19, 2020
Merged

Search Renames / Regen #11342

merged 21 commits into from
May 19, 2020

Conversation

bryevdv
Copy link
Contributor

@bryevdv bryevdv commented May 8, 2020

No description provided.

@bryevdv bryevdv requested review from lmazuel and mayurid as code owners May 8, 2020 20:47
@heaths heaths linked an issue May 11, 2020 that may be closed by this pull request
@@ -43,9 +43,9 @@
edm,
)
from ._service._generated.models import (
Analyzer,
AnalyzeRequest,
Copy link
Member

Choose a reason for hiding this comment

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

Hard to tell from the diff, but these *Request and *Result classes aren't actually exported, are they? They should most often (always, IIRC) be wrapped/transformed before returning.

Copy link
Member

Choose a reason for hiding this comment

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

Same for DataSourceCredentials I see below.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

LimitTokenFilter,
LuceneStandardAnalyzer,
LuceneStandardTokenizer,
Copy link
Member

Choose a reason for hiding this comment

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

There should also be a (new) LuceneStandardTokenizerV2 that was added a couple weeks ago.

@@ -15,7 +15,7 @@

if TYPE_CHECKING:
# pylint:disable=unused-import,ungrouped-imports
from ._generated.models import DataSource
from ._generated.models import SearchIndexerDataSource
Copy link
Member

Choose a reason for hiding this comment

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

The client name should be {Model}Client here and elsewhere, so SearchIndexerDataSourceClient. Getters from SearchServiceClient should match (for now; we're discussing with archboard but this would be currently consistent).

Copy link
Contributor Author

@bryevdv bryevdv May 11, 2020

Choose a reason for hiding this comment

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

This is the name of the model in the generated code, not the convenience layer client

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The current name of this client is SearchDataSourcesClient so I guess it would also need to be updated (in a different place)

'replacement': {'key': 'replacement', 'type': 'str'},
'description': {'key': 'description', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'credentials': {'key': 'credentials', 'type': 'DataSourceCredentials'},
Copy link
Member

Choose a reason for hiding this comment

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

The only propery on this - ConnectionString - should actually be on the SearchIndexerDataSource type. This isn't passed in by the user, is it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They currently do. This will be a change to the current samples too.

@bryevdv
Copy link
Contributor Author

bryevdv commented May 19, 2020

@heaths @lmazuel @johanste Thoughts on merging this now as-is so @xiangyan99 can carry on with on top of this work? This has most of the #10860 but not any of #11506

@bryevdv
Copy link
Contributor Author

bryevdv commented May 19, 2020

Well, that's what I get for trying to resolve a merge conflict from the web UI

@heaths
Copy link
Member

heaths commented May 19, 2020

I think I'd be okay with that, but I'm not really sure how much of the renames this PR that says it's about "renames" contains. If you're taking it in pieces, fine, but maybe get a version uploaded to APIView (just the text output of APIs, right?) ASAP so we can compare. It's hard enough in GitHub to see the renames, but harder still when spread across multiple PRs. APIView or even just a gist of before/after would probably be easier to see if anything was missed.

@bryevdv
Copy link
Contributor Author

bryevdv commented May 19, 2020

I'm not really sure how much of the renames this PR that says it's about "renames" contains.

@heaths I made an attempt at atomic commits just so that this would be transparent:

Analyzer -> LexicalAnalyzer
StandardAnalyzer -> LuceneStandardAnalyzer
StandardTokenizer -> LuceneStandardTokenizer
DataSource -> SearchIndexerDataSource
DataContainer -> SearchIndexerDataContainer
Skillset -> SearchIndexerSkillset
Skill -> SearchIndexerSkill
TokenInfo -> AnalyzedTokenInfo
EncryptionKey -> SearchResourceEncryptionKey
IndexerExecutionInfo -> SearchIndexerStatus
Indexer -> SearchIndexer
Tokenizer -> LexicalTokenizer
Field -> SearchField
Index -> SearchIndex
update for AccessCondition

If it helps I could add some indications/markings in the table in #10860

@heaths
Copy link
Member

heaths commented May 19, 2020

Annotations in that bug could help (or just remove the ones you did already - it's all tracked); though, even if we just diff the API somehow when you're done, that works as well. Whatever is easier for both you and reviewers like me. I'm not against piecemeal changes, just saying it's harder to see how much was done. 🙂

@bryevdv bryevdv merged commit 2598959 into Azure:master May 19, 2020
iscai-msft added a commit to iscai-msft/azure-sdk-for-python that referenced this pull request May 21, 2020
…into make_canary_test

* 'master' of https://github.com/Azure/azure-sdk-for-python: (28 commits)
  Kaihuis maps (Azure#11574)
  [formrecognizer] support Copy API (Azure#11372)
  Artifact Powered Docs.MS Release (Azure#11395)
  Sync eng/common directory with azure-sdk-tools repository (Azure#11562)
  Updated changelog (Azure#11554)
  update pinned versions in autorest_req.txt (Azure#11557)
  Add user authentication API to UsernamePasswordCredential (Azure#11528)
  Reduce Build Matrix (Azure#11539)
  Prevent Key Vault test failure due to operation timing (Azure#11552)
  update tests (Azure#11534)
  Datashare 2019 11 01 (Azure#11540)
  Search Renames / Regen (Azure#11342)
  update unit test according to the latest uamqp update (Azure#11533)
  Sync eng/common directory with azure-sdk-tools repository (Azure#11472)
  rename input parameters (Azure#11518)
  [cosmos] readme review feedback (Azure#11527)
  Update CODEOWNERS (Azure#11516)
  [Core] Support multipart changesets (Azure#10972)
  fix AttributeException (Azure#11463)
  release-for-hanaonazure-mgmt (Azure#11441)
  ...
iscai-msft added a commit that referenced this pull request May 21, 2020
…into feature/text_analytics_v3.0

* 'master' of https://github.com/Azure/azure-sdk-for-python: (28 commits)
  Kaihuis maps (#11574)
  [formrecognizer] support Copy API (#11372)
  Artifact Powered Docs.MS Release (#11395)
  Sync eng/common directory with azure-sdk-tools repository (#11562)
  Updated changelog (#11554)
  update pinned versions in autorest_req.txt (#11557)
  Add user authentication API to UsernamePasswordCredential (#11528)
  Reduce Build Matrix (#11539)
  Prevent Key Vault test failure due to operation timing (#11552)
  update tests (#11534)
  Datashare 2019 11 01 (#11540)
  Search Renames / Regen (#11342)
  update unit test according to the latest uamqp update (#11533)
  Sync eng/common directory with azure-sdk-tools repository (#11472)
  rename input parameters (#11518)
  [cosmos] readme review feedback (#11527)
  Update CODEOWNERS (#11516)
  [Core] Support multipart changesets (#10972)
  fix AttributeException (#11463)
  release-for-hanaonazure-mgmt (#11441)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Search: Proposed model and property renames
3 participants