>> parser.parse_args(['-vvv'])\r\nNamespace(verbose=3)\r\n```\nthe problem with counting `-v` is there's no way to access `WARN` and `ERROR`. We could count `-q` (quiet) or similar for that.\n@casperdcl so, it would start on `INFO` by deafult, if you want just warnings then use one `-q`, if you want to silence everything `-qq`, and one `-v` will be for `DEBUG` and two for `TRACE`, right?\r\n\r\n:thinking: let's wait for the opinion of @shcheklein, @efiop , @Suor , @pared (need some quorum on this one, can't decide by myself)\nI am ok with counting `v/q`s, this is more friendly for typing in. `--log` might be useful for scripting - more obvious when you read it, not sure how much common scripting dvc is though.\r\n\r\nSo my preference: implement `v/q`s, and keep `--log` up our sleeves for now.\nAwesome, @Suor , I'll add those implementation details to the description.\nperhaps creating & using `logging.TRACE = 5` is better than this env var?\n@casperdcl could you explain a little bit more? I'm not sure where the user should set the `logging.TRACE = 5` is it through the config file?\n\ncmd|level\n--:|:--\ndefault|INFO\n`-v`|DEBUG\n`-vv`|TRACE\nOhh got it :+1: yep, that's what I purposed first on the linked issue:\r\n\r\n> My suggestion would be to create different verbose levels, -vvv (INFO, DEBUG, DATABASE?)\r\n> ...\r\n> Modify the -v so you can express the level of verbosity with several ones -vvv\r\n> https://github.com/iterative/dvc/issues/2329#issue-473668442\r\n\r\nI like this idea better instead of using the env var\nthough really I'd prefer `--log TRACE|DEBUG|INFO|WARN(ING)|ERROR|FATAL`, and for backward compatibility `-v` is a shortcut for `--log DEBUG` \n@casperdcl is this more common? I'm more used to the v's :sweat_smile: \r\n\r\nEven the `argparse` documentation has a section on it:\r\n```python\r\n>>> parser = argparse.ArgumentParser()\r\n>>> parser.add_argument('--verbose', '-v', action="https://huggingface.co/datasets/nebius/count")\r\n>>> parser.parse_args(['-vvv'])\r\nNamespace(verbose=3)\r\n```\nthe problem with counting `-v` is there's no way to access `WARN` and `ERROR`. We could count `-q` (quiet) or similar for that.\n@casperdcl so, it would start on `INFO` by deafult, if you want just warnings then use one `-q`, if you want to silence everything `-qq`, and one `-v` will be for `DEBUG` and two for `TRACE`, right?\r\n\r\n:thinking: let's wait for the opinion of @shcheklein, @efiop , @Suor , @pared (need some quorum on this one, can't decide by myself)\nI am ok with counting `v/q`s, this is more friendly for typing in. `--log` might be useful for scripting - more obvious when you read it, not sure how much common scripting dvc is though.\r\n\r\nSo my preference: implement `v/q`s, and keep `--log` up our sleeves for now.\nAwesome, @Suor , I'll add those implementation details to the description.":1,"Also found out that `dvc run --help` explicitly declares support for `dirs` for both of these options:\r\n\r\n```\r\n -m , --metrics \r\n Declare output metric file or directory.\r\n -M , --metrics-no-cache \r\n Declare output metric file or directory (do not put\r\n into DVC cache).\r\n```\nFrom Discord discussion I assume that `-m`/`-M` flags should not accept directories for now.\n@nik123 That's correct! Thank you so much for looking into it! :pray: ":1,"Hi @florianspecker !\r\n\r\nThanks for reporting this issue! Could you show us verbose log with `$ dvc pull -v`, please?\r\n\r\nI'm pretty sure it is coming from https://github.com/iterative/dvc/blob/0.90.2/dvc/remote/local.py#L457 , but just want to double check.\nHi @efiop thanks a lot for looking into it!\r\n\r\n```\r\n$ dvc pull -v\r\n2020-03-19 14:35:24,577 DEBUG: PRAGMA user_version;\r\n2020-03-19 14:35:24,577 DEBUG: fetched: [(3,)]\r\n2020-03-19 14:35:24,577 DEBUG: CREATE TABLE IF NOT EXISTS state (inode INTEGER PRIMARY KEY, mtime TEXT NOT NULL, size TEXT NOT NULL, md5 TEXT NOT NULL, timestamp TEXT NOT NULL)\r\n2020-03-19 14:35:24,578 DEBUG: CREATE TABLE IF NOT EXISTS state_info (count INTEGER)\r\n2020-03-19 14:35:24,578 DEBUG: CREATE TABLE IF NOT EXISTS link_state (path TEXT PRIMARY KEY, inode INTEGER NOT NULL, mtime TEXT NOT NULL)\r\n2020-03-19 14:35:24,578 DEBUG: INSERT OR IGNORE INTO state_info (count) SELECT 0 WHERE NOT EXISTS (SELECT * FROM state_info)\r\n2020-03-19 14:35:24,578 DEBUG: PRAGMA user_version = 3;\r\n2020-03-19 14:35:25,372 DEBUG: Preparing to download data from 's3:///eac-plv-dataset-iphone5-4k-okr_q4_2019'\r\n2020-03-19 14:35:25,372 DEBUG: Preparing to collect status from s3:///eac-plv-dataset-iphone5-4k-okr_q4_2019\r\n2020-03-19 14:35:25,373 DEBUG: Collecting information from local cache...\r\n2020-03-19 14:35:25,375 DEBUG: Path '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd' inode '403712'\r\n2020-03-19 14:35:25,376 DEBUG: SELECT mtime, size, md5, timestamp from state WHERE inode=?\r\n2020-03-19 14:35:25,376 DEBUG: fetched: [('1580748406000000000', '10042082', '2cb5d8b77eb1ac4f56dfbce8aa2f4dfd', '1584624915719617024')]\r\n2020-03-19 14:35:25,377 DEBUG: UPDATE state SET timestamp = ? WHERE inode = ?\r\n2020-03-19 14:35:25,377 DEBUG: cache '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd' expected '2cb5d8b77eb1ac4f56dfbce8aa2f4dfd' actual '2cb5d8b77eb1ac4f56dfbce8aa2f4dfd'\r\n2020-03-19 14:35:25,379 DEBUG: SELECT count from state_info WHERE rowid=?\r\n2020-03-19 14:35:25,379 DEBUG: fetched: [(506,)]\r\n2020-03-19 14:35:25,380 DEBUG: UPDATE state_info SET count = ? WHERE rowid = ?\r\n2020-03-19 14:35:25,381 ERROR: unexpected error - [Errno 30] Read-only file system: '/Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd'\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/main.py\", line 50, in main\r\n ret = cmd.run()\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/command/data_sync.py\", line 31, in run\r\n recursive=self.args.recursive,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 28, in wrapper\r\n ret = f(repo, *args, **kwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/pull.py\", line 28, in pull\r\n recursive=recursive,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/fetch.py\", line 52, in _fetch\r\n used, jobs, remote=remote, show_checksums=show_checksums\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/data_cloud.py\", line 82, in pull\r\n cache, jobs=jobs, remote=remote, show_checksums=show_checksums\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 382, in pull\r\n download=True,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 346, in _process\r\n download=download,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 255, in status\r\n local_exists = self.cache_exists(md5s, jobs=jobs, name=self.cache_dir)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 214, in cache_exists\r\n + (\"cache in \" + name if name else \"local cache\"),\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 216, in \r\n if not self.changed_cache_file(checksum)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/base.py\", line 759, in changed_cache_file\r\n self.protect(cache_info)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 448, in protect\r\n os.chmod(path, mode)\r\nOSError: [Errno 30] Read-only file system: '/Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd'\r\n------------------------------------------------------------\r\n\r\nHaving any troubles? Hit us up at https://dvc.org/support, we are always happy to help!\r\n\r\n$ dvc fetch -v\r\n2020-03-19 14:35:50,571 DEBUG: PRAGMA user_version;\r\n2020-03-19 14:35:50,572 DEBUG: fetched: [(3,)]\r\n2020-03-19 14:35:50,572 DEBUG: CREATE TABLE IF NOT EXISTS state (inode INTEGER PRIMARY KEY, mtime TEXT NOT NULL, size TEXT NOT NULL, md5 TEXT NOT NULL, timestamp TEXT NOT NULL)\r\n2020-03-19 14:35:50,572 DEBUG: CREATE TABLE IF NOT EXISTS state_info (count INTEGER)\r\n2020-03-19 14:35:50,572 DEBUG: CREATE TABLE IF NOT EXISTS link_state (path TEXT PRIMARY KEY, inode INTEGER NOT NULL, mtime TEXT NOT NULL)\r\n2020-03-19 14:35:50,572 DEBUG: INSERT OR IGNORE INTO state_info (count) SELECT 0 WHERE NOT EXISTS (SELECT * FROM state_info)\r\n2020-03-19 14:35:50,573 DEBUG: PRAGMA user_version = 3;\r\n2020-03-19 14:35:51,361 DEBUG: Preparing to download data from 's3:///eac-plv-dataset-iphone5-4k-okr_q4_2019'\r\n2020-03-19 14:35:51,361 DEBUG: Preparing to collect status from s3:///eac-plv-dataset-iphone5-4k-okr_q4_2019\r\n2020-03-19 14:35:51,361 DEBUG: Collecting information from local cache...\r\n2020-03-19 14:35:51,363 DEBUG: Path '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd' inode '403712'\r\n2020-03-19 14:35:51,363 DEBUG: SELECT mtime, size, md5, timestamp from state WHERE inode=?\r\n2020-03-19 14:35:51,364 DEBUG: fetched: [('1580748406000000000', '10042082', '2cb5d8b77eb1ac4f56dfbce8aa2f4dfd', '1584624925377250048')]\r\n2020-03-19 14:35:51,364 DEBUG: UPDATE state SET timestamp = ? WHERE inode = ?\r\n2020-03-19 14:35:51,365 DEBUG: cache '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd' expected '2cb5d8b77eb1ac4f56dfbce8aa2f4dfd' actual '2cb5d8b77eb1ac4f56dfbce8aa2f4dfd'\r\n2020-03-19 14:35:51,366 DEBUG: SELECT count from state_info WHERE rowid=?\r\n2020-03-19 14:35:51,366 DEBUG: fetched: [(506,)]\r\n2020-03-19 14:35:51,367 DEBUG: UPDATE state_info SET count = ? WHERE rowid = ?\r\n2020-03-19 14:35:51,368 ERROR: unexpected error - [Errno 30] Read-only file system: '/Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd'\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/main.py\", line 50, in main\r\n ret = cmd.run()\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/command/data_sync.py\", line 72, in run\r\n recursive=self.args.recursive,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 28, in wrapper\r\n ret = f(repo, *args, **kwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 508, in fetch\r\n return self._fetch(*args, **kwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/fetch.py\", line 52, in _fetch\r\n used, jobs, remote=remote, show_checksums=show_checksums\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/data_cloud.py\", line 82, in pull\r\n cache, jobs=jobs, remote=remote, show_checksums=show_checksums\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 382, in pull\r\n download=True,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 346, in _process\r\n download=download,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 255, in status\r\n local_exists = self.cache_exists(md5s, jobs=jobs, name=self.cache_dir)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 214, in cache_exists\r\n + (\"cache in \" + name if name else \"local cache\"),\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 216, in \r\n if not self.changed_cache_file(checksum)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/base.py\", line 759, in changed_cache_file\r\n self.protect(cache_info)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 448, in protect\r\n os.chmod(path, mode)\r\nOSError: [Errno 30] Read-only file system: '/Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/2c/b5d8b77eb1ac4f56dfbce8aa2f4dfd'\r\n------------------------------------------------------------\r\n\r\nHaving any troubles? Hit us up at https://dvc.org/support, we are always happy to help!\r\n\r\n$ dvc checkout -v\r\n2020-03-19 14:35:56,999 DEBUG: PRAGMA user_version;\r\n2020-03-19 14:35:56,999 DEBUG: fetched: [(3,)]\r\n2020-03-19 14:35:56,999 DEBUG: CREATE TABLE IF NOT EXISTS state (inode INTEGER PRIMARY KEY, mtime TEXT NOT NULL, size TEXT NOT NULL, md5 TEXT NOT NULL, timestamp TEXT NOT NULL)\r\n2020-03-19 14:35:57,000 DEBUG: CREATE TABLE IF NOT EXISTS state_info (count INTEGER)\r\n2020-03-19 14:35:57,000 DEBUG: CREATE TABLE IF NOT EXISTS link_state (path TEXT PRIMARY KEY, inode INTEGER NOT NULL, mtime TEXT NOT NULL)\r\n2020-03-19 14:35:57,000 DEBUG: INSERT OR IGNORE INTO state_info (count) SELECT 0 WHERE NOT EXISTS (SELECT * FROM state_info)\r\n2020-03-19 14:35:57,000 DEBUG: PRAGMA user_version = 3;\r\n2020-03-19 14:35:57,697 DEBUG: SELECT * FROM link_state\r\n2020-03-19 14:35:57,717 DEBUG: checking if 'short_range/pitch_4/IMG_2543.png'('{'md5': '97f8c0bdc301b6c7711b9d03a0f4da81'}') has changed.\r\n2020-03-19 14:35:57,718 DEBUG: 'short_range/pitch_4/IMG_2543.png' doesn't exist.\r\n2020-03-19 14:35:57,721 DEBUG: Path '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/97/f8c0bdc301b6c7711b9d03a0f4da81' inode '403738'\r\n2020-03-19 14:35:57,721 DEBUG: SELECT mtime, size, md5, timestamp from state WHERE inode=?\r\n2020-03-19 14:35:57,722 DEBUG: fetched: []\r\n2020-03-19 14:35:58,743 DEBUG: Path '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/97/f8c0bdc301b6c7711b9d03a0f4da81' inode '403738'\r\n2020-03-19 14:35:58,744 DEBUG: SELECT mtime, size, md5, timestamp from state WHERE inode=?\r\n2020-03-19 14:35:58,744 DEBUG: fetched: []\r\n2020-03-19 14:35:58,745 DEBUG: INSERT INTO state(inode, mtime, size, md5, timestamp) VALUES (?, ?, ?, ?, ?)\r\n2020-03-19 14:35:58,745 DEBUG: cache '../../../../../Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/97/f8c0bdc301b6c7711b9d03a0f4da81' expected '97f8c0bdc301b6c7711b9d03a0f4da81' actual '97f8c0bdc301b6c7711b9d03a0f4da81'\r\n2020-03-19 14:35:58,749 DEBUG: SELECT count from state_info WHERE rowid=?\r\n2020-03-19 14:35:58,749 DEBUG: fetched: [(506,)]\r\n2020-03-19 14:35:58,749 DEBUG: UPDATE state_info SET count = ? WHERE rowid = ?\r\n2020-03-19 14:35:58,750 ERROR: unexpected error - [Errno 30] Read-only file system: '/Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/97/f8c0bdc301b6c7711b9d03a0f4da81'\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/main.py\", line 50, in main\r\n ret = cmd.run()\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/command/checkout.py\", line 71, in run\r\n recursive=self.args.recursive,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 28, in wrapper\r\n ret = f(repo, *args, **kwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 504, in checkout\r\n return self._checkout(*args, **kwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/repo/checkout.py\", line 83, in _checkout\r\n filter_info=filter_info,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/funcy/decorators.py\", line 39, in wrapper\r\n return deco(call, *dargs, **dkwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/stage.py\", line 161, in rwlocked\r\n return call()\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/funcy/decorators.py\", line 60, in __call__\r\n return self._func(*self._args, **self._kwargs)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/stage.py\", line 993, in checkout\r\n filter_info=filter_info,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/output/base.py\", line 301, in checkout\r\n filter_info=filter_info,\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/base.py\", line 980, in checkout\r\n checksum, path_info=path_info, filter_info=filter_info\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/base.py\", line 798, in changed_cache\r\n return self.changed_cache_file(checksum)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/base.py\", line 759, in changed_cache_file\r\n self.protect(cache_info)\r\n File \"/usr/local/Cellar/dvc/0.90.0/libexec/lib/python3.7/site-packages/dvc/remote/local.py\", line 448, in protect\r\n os.chmod(path, mode)\r\nOSError: [Errno 30] Read-only file system: '/Volumes/dvc/eac-plv-dataset-iphone5-4k-okr_q4_2019/97/f8c0bdc301b6c7711b9d03a0f4da81'\r\n------------------------------------------------------------\r\n\r\nHaving any troubles? Hit us up at https://dvc.org/support, we are always happy to help!\r\n```\n@florianspecker Yep, indeed the issue raises where expected. Thanks for clarifying! Will try to prepare a patch for it today along with a new release.\n@efiop great, thanks a lot for the quick response!":1,"Hi @gamis !\r\n\r\nLooks like shutil.move properly fallen back to copy&delete logic but then failed to delete the source file https://github.com/python/cpython/blob/117830de332c8dfbd9a437c0968e16e11aa7e6a1/Lib/shutil.py#L581 What are the permissions on `dvcregression\\TC3-096.oct`, is it read-only?\nHi @efiop , note that the cache file never gets renamed from it's temporary form, with the random suffix. I confirmed that the cache file is complete; it has the same sha-256 as the original file.\r\n\r\nAlso, TC3-096.oct was originally not read-only but it appears dvc changes it to read only at some point.\n@gamis Indeed, we make it read-only before the move, to make it atomic. https://github.com/iterative/dvc/blob/77bc27799b683bb2d77254b0911b1449989ac211/dvc/utils/fs.py#L111 Strange that we didn't catch it in our windows tests, need to take a closer look...\nI have now tried with a more recent python version (3.8.6, i had been using 3.7.2), and same problem.\r\nI even tried just making the cache on a different local drive, not even a network mount, and it fails.\r\nSo definitely something wrong with dvc knowing when it needs to copy rather than just rename.\n@gamis Makes sense. The regression is likely in https://github.com/iterative/dvc/pull/4832 . Looking into it.\n@gamis Ok, so the issue is that after #4832 we started testing access with that chmod, which also leaves the file with incorrect permissions in case of a failure. Need to handle it gracefully. \nDoes that explain why the cache file isn't being renamed from its temp form to the final form?\n@gamis Yeah, it fails to unlink the temporary file, because on windows if file is read-only - you can't delete it.\n@gamis We've adjusted this in the upstream (future 2.0) and reverted the PR that has caused this bug in 1.11.x. 1.11.12 will be out on pypi in a few minutes. Please give it a try and let us know if that works for you. Thanks! :pray: \nSorry to say, that didn't fix it! \r\n\r\nOn a separate thread of discussion, I've mentioned that we recently abandoned trying to use this shared cache over the network, instead using it as a \"local\" remote. But this same Windows issue persists. \r\n\r\nIf I call `dvc push -v -r z`, I get the output below.\r\n\r\n```bash\r\n2021-01-25 08:55:31,080 DEBUG: Check for update is disabled.\r\n2021-01-25 08:55:31,096 DEBUG: fetched: [(3,)]\r\n2021-01-25 08:57:50,768 DEBUG: Assuming 'H:\\researchdata\\.dvc\\cache\\2b\\95ceac01304e1ce8511f59b07c5db2.dir' is unchanged since it is read-only\r\n2021-01-25 08:57:50,768 DEBUG: Assuming 'H:\\researchdata\\.dvc\\cache\\2b\\95ceac01304e1ce8511f59b07c5db2.dir' is unchanged since it is read-only\r\n2021-01-25 08:57:50,768 DEBUG: Assuming 'H:\\researchdata\\.dvc\\cache\\15\\393c7590870fe4b29f4b6836a38c98.dir' is unchanged since it is read-only\r\n2021-01-25 08:57:50,768 DEBUG: Assuming 'H:\\researchdata\\.dvc\\cache\\15\\393c7590870fe4b29f4b6836a38c98.dir' is unchanged since it is read-only\r\n2021-01-25 08:57:50,784 DEBUG: Preparing to upload data to 'Z:\\researchdata'\r\n2021-01-25 08:57:50,784 DEBUG: Preparing to collect status from Z:\\researchdata\r\n2021-01-25 08:57:50,847 DEBUG: Collecting information from local cache...\r\n2021-01-25 08:53:19,893 DEBUG: cache 'H:\\researchdata\\.dvc\\cache\\81\\466ad7a5e5d242552ae7e170b65bf6' expected 'HashInfo(name='md5', value='81466ad7a5e5d242552ae7e170b65bf6', dir_info=None, size=None, nfiles=None)' actual 'None'\r\n# the above is repeated many times, because I haven't pulled the full dvc repo down to this local cache.\r\n\r\n2021-01-25 08:53:20,080 ERROR: unexpected error - [WinError 6] The handle is invalid: 'Z:\\\\researchdata\\\\29\\\\b21cb5993462d6e33980e361652a6b'\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\main.py\", line 90, in main\r\n ret = cmd.run()\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\command\\data_sync.py\", line 50, in run\r\n processed_files_count = self.repo.push(\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\repo\\__init__.py\", line 54, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\repo\\push.py\", line 35, in push\r\n return len(used_run_cache) + self.cloud.push(used, jobs, remote=remote)\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\data_cloud.py\", line 65, in push\r\n return remote.push(\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\remote\\base.py\", line 56, in wrapper\r\n return f(obj, *args, **kwargs)\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\remote\\base.py\", line 432, in push\r\n return self._process(\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\remote\\base.py\", line 327, in _process\r\n dir_status, file_status, dir_contents = self._status(\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\remote\\base.py\", line 175, in _status\r\n self.hashes_exist(\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\remote\\base.py\", line 132, in hashes_exist\r\n return indexed_hashes + self.cache.hashes_exist(list(hashes), **kwargs)\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\cache\\local.py\", line 47, in hashes_exist\r\n return [\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\cache\\local.py\", line 55, in \r\n if not self.changed_cache_file(\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\cache\\base.py\", line 368, in changed_cache_file\r\n self.tree.protect(cache_info)\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\tree\\local.py\", line 301, in protect\r\n self.chmod(path_info, self.CACHE_MODE)\r\n File \"g:\\temp\\venvs\\dvc_regression\\lib\\site-packages\\dvc\\tree\\local.py\", line 249, in chmod\r\n os.chmod(path, mode)\r\nOSError: [WinError 6] The handle is invalid: 'Z:\\\\researchdata\\\\29\\\\b21cb5993462d6e33980e361652a6b'\r\n------------------------------------------------------------\r\n2021-01-25 08:53:20,142 DEBUG: Version info for developers:\r\nDVC version: 1.11.12 (pip)\r\n---------------------------------\r\nPlatform: Python 3.8.6 on Windows-10-10.0.18362-SP0\r\nSupports: http, https\r\nCache types: hardlink, symlink\r\nCaches: local\r\nRemotes: local, ssh, ssh, local\r\nRepo: dvc, git\r\n\r\n```\n@gamis The move was successful, but `protect()`-ing wasn't, so this is a new issue. We were thinking of just ignoring protect() errors, as they are not fatal, we just try to make the file read-only for some additional safety. Still, pretty odd that chmod is failing like that, might be a filesystem limitation. Could you try `pip install psutil` and then run `dvc doctor` again and show us the output for it, please?\nThis is strange because a) it worked in 1.7.2, and b) If I check that cache file on Z, it is indeed read-only for user, group, and other.\n```bash\r\nDVC version: 1.11.12 (pip)\r\n---------------------------------\r\nPlatform: Python 3.8.6 on Windows-10-10.0.18362-SP0\r\nSupports: http, https\r\nCache types: hardlink, symlink\r\nCache directory: NTFS on H:\\\r\nCaches: local\r\nRemotes: local, ssh, ssh, local\r\nWorkspace directory: NTFS on H:\\\r\nRepo: dvc, git\r\n```\nThis happens on `dvc pull` as well. Not sure why dvc should be trying to modify anything on the remote cache on a pull.\n@gamis It checks if the cache file is intact and tries to set it read-only, so that it doesn't need to check it next time. We could also consider supporting `verify` config option for that, to make dvc skip the verification for those cache files for trusted local remotes (it skips it for most of other remote types by default).\nThat seems like a good option. If other remote types skip it, and people would generally expect a `pull` to not change remote in anyway, then skipping seems appropriate to me. \n@gamis Besides the question of chmoding on remote, I'm still surprised that the chmod error is so odd. It might affect people that have their cache on samba. Leaning towards ignoring such errors for `protect()`, as they are really not fatal.":2,"@ematvey Regarding the gitignore, it is already placed right beside the output file:\r\n```\r\nmkdir -p a/b\r\necho foo > a/b/foo\r\ndvc add a/b/foo\r\n```\r\nwill create a/b/.gitignore. Maybe I've misunderstood your question?\nAbout the wdir and paths in that case, you are right, it is incorrect. Looks like we haven't noticed this bug, but it used to be(and was intended for those precise reasons of portability) to make wdir . and path `foo`.\nI might be mistaken about `.gitignore`.":1,"`allow_none` attribute for field `a` remains `False`. Possible fix may be in pydantic/fields.py:566:\r\n```\r\nif is_union_origin(origin):\r\n types_ = []\r\n for type_ in get_args(self.type_):\r\n if type_ is NoneType or type_ is Any or type_ is object:\r\n if self.required is Undefined:\r\n self.required = False\r\n self.allow_none = True\r\n continue\r\n types_.append(type_)\r\n```\n@mykhailoleskiv That almost works, except it doesn't add `Any` or `object` to `types_` (which eventually becomes `ModelField.sub_fields`). So `M(a=\"abcd\")` or something like that no longer works. I'll open a PR":1,"@gthb Thanks for reporting this! Looks like we are not using post-checkout parameters that are being passed to us by git and are indicating if we are checking out a specific file or a branch/tag/etc. https://git-scm.com/docs/githooks#_post_checkout We need to adjust our hook accordingly.\n@gthb Looks like the third parameter is just what we need. You could try modifying your git hook by hand to see if that will do the job for you. If it does, please let us know, and maybe consider submitting a PR, we really appreciate your contributions :slightly_smiling_face: If it doesn't work, please ping us as well.":1,"Surely as simple as implementing `__getstate__` and `__setstate__` on `ValidatoinError`?\r\n\r\nIf it is that simple, PR welcome to implement it.\nI don't believe so. I did spend a few hours trying to do just that and couldn't get it to work. Iirc, the problem with that approach is that `__setstate__` isn't called until after the object's `__init__` is called. So the error has already occurred and you don't get a chance to fix things.\r\n\r\nReading the pickle docs, it seemed like `__getnewargs_ex__` might be a way to get that to work but i failed at getting that to work too. I'm not sure, though, if i just didn't/don't understand getnewargs or if it turned out that exceptions are specialcased already and that specialcasing was interfering (in one of the python bug reports, ncoghlan noted that there were specialcases in exceptions which perhaps no longer worked with the new ways that picked worked)\r\n\r\n\nMy python.org bug from earlier was a duplicate. I've closed it. This is the older bug: https://bugs.python.org/issue27015 There's a cpython PR which I confirmed would fix at least the mandatory keyword args. It is currently awaiting another review from a python core developer: https://github.com/python/cpython/pull/11580\nHi @abadger I just had a look at it and I think I have something working.\r\nI'm opening a PR! Please tell me if it works with your whole example":1,"Found the root cause of this. This happens because of the optimization that we do if the file is empty (i.e. 0 bytes size). We never create a hardlink for the file with 0 bytes size and therefore it fails when we try to verify if the hardlink was created.\r\n\r\nhttps://github.com/iterative/dvc/blob/a9bc65ee1f0446de766db59ad1b149de064c5360/dvc/remote/local.py#L170-L182\r\n\r\nI think, [`is_hardlink()`](https://github.com/iterative/dvc/blob/a9bc65ee1f0446de766db59ad1b149de064c5360/dvc/remote/local.py#L196) function should be aware of this optimization as well. I'll make a fix tomorrow. \r\n\r\nP.S. This only failed if the file was empty (not even a newline). So:\r\n```sh\r\necho > foo && dvc add foo # works because of extra-newline character added by `echo`\r\ntouch bar && dvc add bar # does not work as the file is empty\r\n```\r\n\r\nAlso, subsequent runs would not fail because before this error is thrown out, the file gets cached (however, deletes file from workspace), i.e.\r\n```sh\r\ndvc init --no-scm\r\ndvc config cache.type hardlink\r\ntouch foo && dvc add foo # fails and deletes foo from workspace\r\ntouch foo && dvc add foo # passes\r\n```\n@skshetry Great investigation! :pray: ":1,"Good idea, @mattlbeck!\r\n\r\nI'm curious if you see benefits beyond ease of use for doing this over inserting the output directly as a code block like:\r\n\r\n````\r\necho '```' >> report.md\r\ndvc exp show >> report.md\r\necho '```' >> report.md\r\n````\n@dberenbaum Honestly hadn't thought of placing inside of a code block. Presumably this only works with `--no-pager`?\r\n\r\nWithout having properly tested this, the only additional benefit of a `--show-md` I can think of is that it would look a bit nicer.\nGood to know. Would you be interested in either trying that workaround and letting us know how it works, or else contributing the `--show-md` option?\nNo problem, I will either submit a PR or close this ticket depending on the outcome.\nThank you! One more thought: the leftmost column condenses multiple items of info (compare to the csv output) that might be hard to show in the same way in markdown. \nAlso, no need to close the ticket. This is at least a pattern we should explicitly support for cml and other ci needs. \nRaw markdown would be more likely to benefit from some features of the platform where the table is being rendered (i.e. in Jupyter you would get rows highlighted on hover).\r\n\r\nTaking Github example below, I kind of like the `--show-md` format better.\r\n\r\nExample \"code block workaround\" (this renders awful on VSCode markdown extension preview, btw):\r\n\r\n```\r\n┏━━━━━━━━━━━━┳━━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━┓\r\n┃ Experiment ┃ Created ┃ loss ┃ accuracy ┃ train.batch_size ┃ train.hidden_units ┃ train.dropout ┃ train.num_epochs ┃ train.lr ┃ train.conv_activation ┃\r\n┡━━━━━━━━━━━━╇━━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━┩\r\n│ workspace │ - │ 0.26484 │ 0.9038 │ 128 │ 64 │ 0.4 │ 10 │ 0.001 │ relu │\r\n│ main │ Sep 14, 2021 │ 0.26484 │ 0.9038 │ 128 │ 64 │ 0.4 │ 10 │ 0.001 │ relu │\r\n│ 5bcd44f │ Sep 01, 2021 │ 0.25026 │ 0.9095 │ 128 │ 64 │ 0.4 │ 10 │ 0.001 │ relu │\r\n│ b06a6ba │ Aug 31, 2021 │ 0.25026 │ 0.9095 │ 128 │ 64 │ 0.4 │ 10 │ 0.001 │ relu │\r\n│ d34fd8c │ Aug 30, 2021 │ 0.30741 │ 0.8929 │ 128 │ 64 │ 0.4 │ 10 │ 0.01 │ relu │\r\n│ 02b68b7 │ Aug 29, 2021 │ 0.44604 │ 0.8483 │ 128 │ 64 │ 0.4 │ 10 │ 0.01 │ relu │\r\n│ 5337519 │ Aug 28, 2021 │ - │ - │ - │ - │ - │ - │ - │ - │\r\n└────────────┴──────────────┴─────────┴──────────┴──────────────────┴────────────────────┴───────────────┴──────────────────┴──────────┴───────────────────────┘\r\n```\r\n\r\nPure markdown:\r\n\r\n| Experiment | Created | loss | accuracy | train.batch_size | train.hidden_units | train.dropout | train.num_epochs | train.lr | train.conv_activation |\r\n|--------------|--------------|---------|------------|--------------------|----------------------|-----------------|--------------------|------------|-------------------------|\r\n| workspace | - | 0.26484 | 0.9038 | 128 | 64 | 0.4 | 10 | 0.001 | relu |\r\n| main | Sep 14, 2021 | 0.26484 | 0.9038 | 128 | 64 | 0.4 | 10 | 0.001 | relu |\r\n| 5bcd44f | Sep 01, 2021 | 0.25026 | 0.9095 | 128 | 64 | 0.4 | 10 | 0.001 | relu |\r\n| b06a6ba | Aug 31, 2021 | 0.25026 | 0.9095 | 128 | 64 | 0.4 | 10 | 0.001 | relu |\r\n| d34fd8c | Aug 30, 2021 | 0.30741 | 0.8929 | 128 | 64 | 0.4 | 10 | 0.01 | relu |\r\n| 02b68b7 | Aug 29, 2021 | 0.44604 | 0.8483 | 128 | 64 | 0.4 | 10 | 0.01 | relu |\r\n| 5337519 | Aug 28, 2021 | - | - | - | - | - | - | - | - |\r\n":1,"Currently for `cache_exists()` threaded traverse, there is a single progress bar that shows that tracks how many cache prefixes (out of 256) have been fetched. For large remotes, fetching each prefix will still be a slow operation, and it may appear to the user that dvc is hanging.\r\n\r\nSince we have an estimated size for the remote and know approximately how many objects/pages will be returned for each prefix, we can track progress for the total number of pages fetched rather than the number of prefixes fetched.":1,"Would it make sense for `type=\"dl\"` to generate:\r\n\r\n```yaml\r\nstages:\r\n train:\r\n cmd: python train.py\r\n deps:\r\n - train.py\r\n metrics:\r\n - dvclive.json:\r\n cache: false\r\n plots:\r\n - dvclive/scalars:\r\n cache: false\r\n```\r\n\r\nWhere `dvclive` would be replaced by the value passed to `--live` (if any) ?\ncc @dberenbaum @skshetry \n@daavoo Would you be up to contribute this change?\n> @daavoo Would you be up to contribute this change?\r\n\r\nIf you all agree on proposed workaround, yes\nSorry, I think I was too quick to approve this. Looking at it now, it seems more transparent to:\r\n\r\n* Make `--live` optional and off by default for both `default` and `dl`. This makes `--type dl` seem less useful since it only differs by including checkpoints, but I don't think it's bad that we are unifying and simplifying.\r\n* Make `--live` independent from whether to include `checkpoints: true`.\r\n* Make `--live` mutually exclusive with `metrics` and `plots`.\r\n* If `--live` and `--interactive` are both present, don't ask for `metrics` or `plots`.\r\n\r\nThis hopefully makes it a simple convenience to replace `metrics` and `plots` easily when using dvclive. \r\n\r\nAgain, sorry for not catching this earlier.\r\n\r\nThoughts?":1,"Your approach sounds very good to me, PR welcome.\r\n\r\nQuestions:\r\n* I assume this would not impact performance. Am I right?\r\n* Are there any situations where this could cause problems or backwards incompatibility? E.g. do we need to wait for v2? I assume not.\r\n* Are there any other places where this could help? E.g. ipython maybe? Presumably not pycharm, vscode or vim? \nWould it work to just set the `__signature__` attribute of the model `__init__`? This is enough to work with `inspect.signature`, which is used, for example, by FastAPI; I'm not sure how it relates to the other tools discussed above.\r\n\r\nIf you just need to update `__signature__`, I have a variety of examples doing this for various fastapi-related purposes that may be useful for reference.\r\n\r\nSee, for example, here:\r\nhttps://gist.github.com/dmontagu/87e9d3d7795b14b63388d4b16054f0ff#file-fastapi_cbv-py-L37-L47\r\n\r\nAlso, I have worked through most of the config-related logic for what the generated signature should look like in the mypy plugin. So that might provide a good reference, e.g., if `Config.allow_extra` is `False` or similar, and you want to be really careful.\n> I assume this would not impact performance. Am I right?\r\n\r\nThis has relatively small impact only on model creation.\r\n\r\n> Are there any situations where this could cause problems or backwards incompatibility? E.g. do we need to wait for v2? I assume not.\r\n\r\nIf we implement this right (e. g. respect `__code__` differences between python versions), no, I don't think so.\r\n\n### Question to think about: \r\nWhat if subclass of a model declares `__init__`? Would we merge it's signature, rewrite it or leave as is?\r\n```py\r\nclass MyModel(BaseModel):\r\n id: int\r\n name: str = 'John' \r\n\r\n def __init__(self, foo: int = 41, **data):\r\n self.foo = foo + 1 \r\n return super().__init__(**data)\r\n```\n> Would it work to just set the `__signature__` attribute of the model `__init__`? This is enough to work with `inspect.signature`, which is used, for example, by FastAPI; I'm not sure how it relates to the other tools discussed above.\r\n\r\n@dmontagu , just to be clear, do you suggest construct new signature from scratch and set it to `__init__`, or generate function and copy its signature to `__init__`?\nGenerate a new signature from scratch; it's not too hard using the objects from the `inspect` module.\nSounds good. Having `__signature__` is enough for FastAPI to understand right parameters. \r\n\r\nHowever, I'm not sure if it's gonna work everywhere, as `__signature__` is not present in function type by default and used only in `inspect` module.\r\n\r\nI think the best is to have all: valid `__wrapped__`, `__kwdefaults__`, `__annotations__` and `__signature__` together to make sure any kind of inspection will work properly.\r\n\nOh, looks like there's case when we can't use `__signature__`:\r\n```py\r\n if not name.isidentifier():\r\n> raise ValueError('{!r} is not a valid parameter name'.format(name))\r\nE ValueError: 'this-is-funky' is not a valid parameter name\r\n```\n@MrMrRobat \r\nI think `this-is-funky` is an invalid signature name.\r\nIs there a case to give a method an invalid name?\r\nIf I misread it, sorry. \nI'm assuming this is coming from an alias? Yeah, I'm generally against giving methods signatures based on aliases.\r\n\r\nIn general, aliases don't seem to play super nicely with existing python tools, a reason I heavily prefer having `allow_population_by_alias=True`.\r\n\r\nI think part of the problem is that `__init__` is used for *both* parsing, where JSON schema conventions are important, *and* initializing in non-parsing contexts, where python conventions are important (e.g., for type checking, auto-docs-generation, IDEs, etc.).\r\n\r\nThe `construct` method mitigates this to some extent, but I think there is still some awkwardness, e.g., if you need your validators to run on the inputs. I think I personally would prefer if `__init__` always expected non-aliases, and aliases were only relevant for the `parse` methods.\r\n\r\n(But I recognize obviously that's a huge breaking change from how things work now, so will probably never happen, and others may not feel the same way I do on this point anyway 😅.)\n> I think `this-is-funky` is an invalid signature name.\r\n> Is there a case to give a method an invalid name?\r\n\r\nNot a method, but field. \r\n\r\n>I'm assuming this is coming from an alias?\r\n\r\nIn comes from test_create_model:\r\nhttps://github.com/samuelcolvin/pydantic/blob/c71326d4a6898612597d3c647a4256f168818e30/tests/test_create_model.py#L127-L136\r\n\n@MrMrRobat \r\nWe should ignore an invalid field name to create `__signature__` when using `create_model()` with an invalid name.\r\nAlso, Someone may want to add valid field to `__sigunature___` on Model which is created by `create_model()`\r\n```python\r\nmodel = create_model('FooModel', **{'this-is-funky': (int, 1), 'bar': (int, ...)})\r\nm = model(**{'this-is-funky': '123', 'bar': '456'})\r\nassert m.dict() == {'this-is-funky': 123, 'bar': 456}\r\n\r\nprint(inspect.signature(model))\r\n# > (**data: Any) -> None\r\n\r\nprint(model(bar='789'))\r\n# > FooModel this-is-funky=1 bar=789\r\n\r\n```":1,"This sounds like a bug, but it might need to wait for v2 to be fixed since it could be considered a breaking change. \nI have a fix for this, duplicating the datetime's method of handling timedeltas. The rest of the module doesn't seem refactored to reduce duplicated code. I assume this change is is okay / better by keeping it that way?\r\n\r\nThis is my work so far: https://github.com/samuelcolvin/pydantic/commit/1d59058a2ae6f4b0f2f119b8eddc1529c5789d86":1,"please give more details on what you're asking for and how it would be useful.\r\n\r\nClosing but happy to reopen if more details are provided.":1,"thanks for reporting, agreed it should apply to all fields.\r\n\r\nCould you try on master or v1.0b2 and confirm if it's still broken?\nJust tested it on `master` and can confirm it is still broken.":1,"The reason is, by setting the `max_length` in `b` (`b: StrictBytes = Field(..., max_length=5)`), it won't be considered as `StrictBytes` anymore. then the provided value `123` will be converted to `bytes` during validation\r\n\r\n```python\r\nfrom pydantic import BaseModel, StrictBytes, Field\r\n\r\n\r\nclass Model(BaseModel):\r\n a: StrictBytes = Field(...)\r\n b: StrictBytes = Field(..., max_length=5)\r\n\r\nm = Model(a=b'arthur', b=123) # does not raise\r\nprint(m) # a=b'arthur' b=b'123'\r\n```\r\n\r\nI am not sure if is it an intended behavior or not. @samuelcolvin what is your opinion here?\nIt's an error, happy to review a PR if it's simple and submitted asap. Otherwise this is/will be fixed in V2.":1,"afaik `TypedDict` is supported by pydantic, see #760.\r\n\r\nAnything that does work will be flakey, will not perform proper validation and could break at any time.\r\n\r\nI think best to explicitly raise an error whenever a `TypedDict` is used, saying\r\n\r\n>`TypedDict` is not yet supported, see #760\r\n\nI think `TypedDict` fields were usable with pydantic==1.4, but, as far as I can tell, the above `TypeError` does occur in pydantic>=1.5. \r\n\r\nI think you're right, though, and it probably is best to raise an explicit error when `TypedDict` is used as a model field until `TypedDict` is fully supported. \nI confirm `TypedDict` were usable with pydantic 1.4\nThere's no logic for validating `TypedDict`, so while you might have been able to use them, I very much doubt it was a good idea.\r\n\r\nWe should either support them fully or raise a sensible exception explaining that they don't work.\r\n\r\nThis is an issue about raising a better error, #760 is about supporting them fully.\nI'm aware that no logic validation is currently performed by _pydantic_ and it is fine with me. \r\n\r\n> We should either support them fully or raise a sensible exception explaining that they don't work.\r\n\r\nThere is also the option of treating them as `Dict[Any, Any]` for validation (they are dict at run-time after all). That way, one could still get proper _mypy_ warnings during development and pydantic validation would just reduce to `isinstance(variable, dict)` \r\n\r\nv1.4 behaved like this:\r\n\r\n```\r\nIn []: from typing import TypedDict \r\nIn []: from pydantic import BaseModel\r\n \r\nIn []: class MyDict(TypedDict): \r\n ...: a: int\r\n \r\nIn []: class A(BaseModel): \r\n ...: d: MyDict \r\n\r\nIn []: A(d={}) \r\nOut[]: A(d={})\r\n\r\nIn []: A(d=12) \r\n---------------------------------------------------------------------------\r\nValidationError: 1 validation error for A\r\nd\r\n value is not a valid dict (type=type_error.dict)\r\n```\r\n\r\n\n> There's no logic for validating TypedDict\r\n\r\nActually TypedDict does contain validation instructions\r\n\r\n```\r\n>>> from typing import TypedDict\r\n\r\n>>> class Person(TypedDict):\r\n... name: str\r\n... age: int\r\n\r\n>>> Person.__annotations__\r\n{'name': , 'age': }\r\n```\r\n\r\nSo technically Pydantic should be able to validate dictionaries that are type hinted with `TypedDicts`\nYes, it's possible, now someone just needs to go and implement the feature. 😄 \nI currently have a working solution for this which does validation based on the TypedDict annotations as suggested. I'm currently writing test cases and will post an update when I've got full coverage.\nMy solution is here, but there are parts of it that I think could probably be done better:\r\n[https://github.com/kpberry/pydantic/commits/typed-dict-support](url)\r\n\r\n1. `TypedDict` does not support `issubclass` checks (which was the initial issue in this thread), so in order to check if a type is a subtype of `TypedDict` in `ModelField._type_analysis`, it seems like we need to check if it is a subclass of `TypedDict`'s metaclass. Unfortunately, `_TypedDictMeta` is protected in both the typing and typing_extensions module, so the mypy check won't allow it to be imported (probably for good reason). For now, I check `self.type_.__class__.__name__ == '_TypedDictMeta'`, but I think there must be a better way to do this.\r\n2. I'm not sure what the best spot is in `ModelField._type_analysis` to do the `TypedDict` subclass check. I put it before the origin checks to avoid the issue at the top of this thread, but there might be a better spot for it.\r\n3. I added each `TypedDict` value type to `self.sub_fields` in `ModelField._type_analysis`, since it fit the pattern for validating `Tuple`s, etc. However, since each value corresponds to a specific named key, I had to add a `key_name` attribute to `ModelField` with the key name in order to implement `ModelField._validate_typeddict`. I'm not sure if it's a good idea to add new attributes to `ModelField` for this, especially considering that it's a relatively niche feature.\r\n\r\nWould appreciate feedback/suggestions before trying to make a pull request.\r\n\r\nEdit: Forgot to mention, all tests are passing and all lines that I added should be covered.\r\nEdit 2: I noticed that there's an optional `total` parameter to `TypedDict`, so I added support and tests for that.":1,"Awesome! Please also check the latest state of the changes in iterative/dvc.org/pull/967 so both sides are in sync when this is addressed 🙂 \nAlso, should the file name be `list.py`? its `ls.py` now.\nAnd not sure about the `target` name for the last param... Why not `path` like in `dvc get/import`?\r\nUPDATE: Investigating in https://github.com/iterative/dvc.org/pull/1021#pullrequestreview-368410823\nAnother question here: is there an easy way to tell which files in the list are tracked by DVC and which ones by Git? This is kind of important for finding paths that can be sent to `dvc import/get`.\n@jorgeorpinel At this moment only coloring is supported as a way of the differentiating types of the files.\r\nYou may read more in [the comment](https://github.com/iterative/dvc/issues/3431#issuecomment-593560766)\n@JIoJIaJIu I think that link is just somewhat relevant. We have two things to colorize in a different way:\r\n\r\n1. DVC tracked files - e.g. we need to use a different color for a directory we did `dvc add data\\` with. Or the same for `dvc add data\\data.xml`. And we should have a flag (--outs?) to filter DVC \"outputs\" only.\r\n2. DVC-files - we can use a color scheme for links, for example (since they serve to some extent as a link)\r\n3. Git-traked .dvcignored files.\r\n\r\nThat link it probably relevant to 3 only, but most likely @jorgeorpinel was asking about 1.\r\n\r\n\n> That link it probably relevant to 3 only\r\n\r\nIn the comment I provided info about **1** and **2** scenarios, but the main issue relates to **3**, right\r\nLet me summarize it here then\r\n\r\nWe color output as `out=color`\r\n```\r\nLS_COLORS=\"out=01;37\" dvc list ...\r\n```\r\nwill color outs only\nOK thanks for the info guys, that's great to know. But since colorizing is not enabled by default (I assume) nor supported in every system, would it make sense to add another way to tell them apart? It can be as simple as a 2nd column in the output that has either `git` or `dvc`, or maybe only `out` for DVC outputs (stuff that you can `dvc import/get`). After all this was one of the main motivations for `dvc list` in the first place.\n@jorgeorpinel what is the motivation for you to distinguish DVC-tracked and Git-tracked files by default? The whole point is to make the whole experience with get/import/list the same for all files as much as possible.\nTrue, I forgot you can get/import Git-tracked files now!":1,"Hi @lefos99 !\r\n\r\nCould you show the contents of `annotator/Annotation_0_hotspot_0.json.dvc`, please? \nHi @efiop \r\n\r\nWhich file do you mean? I don't have such a file in this directory.\r\n\r\n**Update:**\r\nSorry now I saw the confusion, I fixed my initial comment. (Sorry I had to hide some sensitive information)\n@lefos99 Thanks! Makes sense now! Ok, I'm able to reproduce with:\r\n```\r\n#!/bin/bash\r\n\r\nset -e\r\nset -x\r\n\r\nrm -rf myrepo\r\nmkdir myrepo\r\ncd myrepo \r\ngit init\r\ndvc init\r\nDATA=/tmp/$(uuidgen)\r\necho foo > $DATA\r\nmkdir data\r\nln -s $DATA data/foo\r\ndvc add data/foo\r\ndvc add data/foo\r\n```\r\nlooks like our dag check broke for symlinks that are in a repo subdir :scream: Bumping up the priority...\n@efiop, I see it working as expected.\r\n\r\nThe first `dvc add data/foo` adds to the cache and links from the cache (by default, here with the `copy` replacing the symlink).\r\nAlso, when the path is symlink, dvc creates stage file in the working directory as `foo.dvc` instead of `data/foo.dvc`.\r\n\r\nThe second `dvc add data/foo` tries to create the `.dvc` file in `data/foo.dvc` as `data/foo` is no longer a symlink, and fails as there's already a different stage.\r\n\r\nWe could definitely fix this by making `contains_symlink_up_to` smarter (here :arrow_down:):\r\nhttps://github.com/iterative/dvc/blob/f0a729df4d6ae259f3b40be32ea2f9f6be0aa3db/dvc/utils/fs.py#L71\r\n\r\nBut, this whole different link strategy in symlink/non-symlink case will for sure bite us somewhere else. More research might be needed to fix this issue to fix repeated `dvc add` calls (if this even is an issue). \r\n\nShould note that the original issue (#1648) which `contains_symlink_up_to` was supposed to address appears to be broken again (for new git related reason) in current master:\r\n\r\n```\r\n...\r\n2020-10-23 17:29:45,759 ERROR: /Users/pmrowla/git/scratch/test-4654/dvc_example/my_repo/data/data_file\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"/Users/pmrowla/git/dvc/dvc/command/add.py\", line 17, in run\r\n self.repo.add(\r\n File \"/Users/pmrowla/git/dvc/dvc/repo/__init__.py\", line 51, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"/Users/pmrowla/git/dvc/dvc/repo/scm_context.py\", line 4, in run\r\n result = method(repo, *args, **kw)\r\n File \"/Users/pmrowla/git/dvc/dvc/repo/add.py\", line 90, in add\r\n stage.save()\r\n File \"/Users/pmrowla/git/dvc/dvc/stage/__init__.py\", line 386, in save\r\n self.save_outs(allow_missing=allow_missing)\r\n File \"/Users/pmrowla/git/dvc/dvc/stage/__init__.py\", line 398, in save_outs\r\n out.save()\r\n File \"/Users/pmrowla/git/dvc/dvc/output/base.py\", line 263, in save\r\n self.ignore()\r\n File \"/Users/pmrowla/git/dvc/dvc/output/base.py\", line 243, in ignore\r\n self.repo.scm.ignore(self.fspath)\r\n File \"/Users/pmrowla/git/dvc/dvc/scm/git.py\", line 195, in ignore\r\n entry, gitignore = self._get_gitignore(path)\r\n File \"/Users/pmrowla/git/dvc/dvc/scm/git.py\", line 181, in _get_gitignore\r\n raise FileNotInRepoError(path)\r\ndvc.scm.base.FileNotInRepoError: /Users/pmrowla/git/scratch/test-4654/dvc_example/my_repo/data/data_file\r\n------------------------------------------------------------\r\n```":1,"Hello @umesh-timalsina \r\nThis is a known \"issue\", which may or may not be changed in v2. It reminds me of #265, which could help you. I'm currently not with my computer sorry\nHello @PrettyWood. Thanks for the response. I will check the issue out.":1,"Can reproduce. Taking a look\nWhen serializing the ParamsDependency to the lock file (`dvc.lock`), the tuple gets converted to a list (because `dvc.lock` is in YAML format).\r\n\r\nOn the subsequent `dvc repro` execution, the value in the params file gets correctly loaded as a tuple but compared against the serialized list (https://github.com/iterative/dvc/blob/main/dvc/dependency/param.py#L127), always reporting it as modified.":1,"I'll take it. @efiop If you have any hints to make work more efficient, I'll grateful :)":1,"I don't think we want more config options unless absolutely required.\r\n\r\nThe solution here is to allow `schema_extra` to be a function which can mutate the schema, #889. Happy to accept a PR for that. ":1,"Looked at this and I see several issues with code, most of which also affect performance:\r\n\r\n1. `DvcIgnore*` classes designed around using them in `walk()`, which leads to excessively complex code handling check for full path.\r\n2. All the complexity above is added to `CleanTree`, which makes it go into `DvcIgnore*` domain. It should really look like:\r\n ```python\r\n def isfile(self, path):\r\n return self.tree.isfile(path) and not self.dvcignore.match_file(path)\r\n ```\r\n3. `DvcIgnore*` hierarchy forces sequential check against all rules and regexes. This might be optimized by constructing single structure, i.e. a big regex or a prefix tree. This is complicated by the fact that dvcignores may contain negations though.\r\n4. `pathspec` library also checks against all regexes sequentially, which adds to 3.\r\n5. **High level issue**. I suspect that we recheck files found via walk, so we run ignores twice. It needs to be estimated whether this is an issue.\nThank you @Suor \r\n\r\nIt seems consistent with what I experienced. The more I add lines in `.dvcignore`, the slowest `dvc status` is.\n> Looked at this and I see several issues with code, most of which also affect performance:\r\n> \r\n> 1. `DvcIgnore*` classes designed around using them in `walk()`, which leads to excessively complex code handling check for full path.\r\n> 2. All the complexity above is added to `CleanTree`, which makes it go into `DvcIgnore*` domain. It should really look like:\r\n> ```python\r\n> def isfile(self, path):\r\n> return self.tree.isfile(path) and not self.dvcignore.match_file(path)\r\n> ```\r\n> 3. `DvcIgnore*` hierarchy forces sequential check against all rules and regexes. This might be optimized by constructing single structure, i.e. a big regex or a prefix tree. This is complicated by the fact that dvcignores may contain negations though.\r\n> 4. `pathspec` library also checks against all regexes sequentially, which adds to 3.\r\n> 5. **High level issue**. I suspect that we recheck files found via walk, so we run ignores twice. It needs to be estimated whether this is an issue.\r\n\r\n@Suor \r\nI also have an interest in this issue and had looked into the code. And here is my solution to some of the issues above:\r\n1. For point (1), `walk()` should use information from `DvcIgnore`. For example, exiting the `.git` directory at the beginning of the iteration.\r\n2. For point (3), according to [this article](https://www.freecodecamp.org/news/regex-was-taking-5-days-flashtext-does-it-in-15-minutes-55f04411025f/), tried tree or automaton would only perform better if the number of ignored-expressions was greater than several hundred. \r\n3. For point (4), In `pathspec` \r\n```python\r\n\tmatched = False\r\n\tfor pattern in patterns:\r\n\t\tif pattern.include is not None:\r\n\t\t\tif file in pattern.match((file,)):\r\n\t\t\t\tmatched = pattern.include\r\n\treturn matched\r\n```\r\nIt should stop if any of the patterns matched the file. \r\n@courentin\r\nAnd I think this is the main reason that It gets slower as the ignore list grows. \r\n\r\nI'd like to try to solve these points this weekend.\n@karajan1001 \r\n1. There is no issue with walk, the ignored dir won't we traversed. The issue is when we need to check whether `some/path/abc/file.txt` is ignored we need to build all of its parents and test them in an unnatural way.\r\n\r\n> It should stop if any of the patterns matched the file.\r\n\r\nSo for very common case that file is not ignored it will match it against all of those.\n> 1. There is no issue with walk, the ignored dir won't we traversed. The issue is when we need to check whether `some/path/abc/file.txt` is ignored we need to build all of its parents and test them in an unnatural way.\r\n\r\nThank you\r\nDos `Dvcignore` support expressions like `../*.csv` which influences files outside the current path?\r\n\r\n\nHaha, underrated the difficulty of it. Only written the benchmark (https://github.com/iterative/dvc-bench/pull/30).\r\n\r\n\r\n\r\n> 5\\. **High level issue**. I suspect that we recheck files found via walk, so we run ignores twice. It needs to be estimated whether this is an issue.\r\n\r\n@Suor, According to @courentin 's call graph in #3867 it only runs once.\n@efiop @pared \r\nI have a question how could I test unmerged changes using `dvc-bench`.\n@karajan1001 \r\nPrepared PR explaining this in README, please take a look and review:\r\nhttps://github.com/iterative/dvc-bench/pull/41\n> Dos Dvcignore support expressions like ../*.csv which influences files outside the current path?\r\n\r\n@karajan1001 No, same as gitignore, it cannot look back in the tree.\n> README\r\n\r\nThank you\n@pared Should we keep this open or are we fully done here?\n@efiop sorry, autoclose. Seems to me we should leave it open. The issue potentially is still present in the case of multiple `dvcignore` files. Also, points noted by @Suor (https://github.com/iterative/dvc/issues/3869#issuecomment-635854916) still need to be addressed.\r\n\r\nEDIT:\r\n#3967 addresses 2 points out of 5 (addressed points are 3 and 4)":1,"Hello @kataev \r\nI agree the behaviour is not the expected one and for me this is a bug.":1,"Is there a nice RFC explicitly stating a limit for port? If so I guess we could add a check, but this is not a bug, just a limit of the current validation.\r\n\r\nYou can implement a much cleaner validator:\r\n\r\n```py\r\nclass Test(BaseModel):\r\n url: stricturl(allowed_schemes=['tcp'])\r\n\r\n @validator('url')\r\n def validate_port(cls, v):\r\n if int(v.port) > 2**16:\r\n raise ValueError('port overflow')\r\n return v\r\n```\nHi,\r\n[rfc 793](https://tools.ietf.org/html/rfc793#section-3.1) explain ports are 16 unsigned bits\r\n\r\nYour validator will fail if port is missing, with tcp protocol that doesn't really make sense but with http(s) protocol is does:\r\nexample\r\n\r\n`http://example.com` the validator will fail because v.port is None, int will raise a TypeError, but thanks for the tips I totally forgot port attribute 🤦\r\n\r\n\r\n```py\r\nclass Test(BaseModel):\r\n url: stricturl(allowed_schemes=['tcp'])\r\n\r\n @validator('url')\r\n def validate_port(cls, v):\r\n if v.port is None:\r\n return v\r\n elif int(v.port) > 2**16:\r\n raise ValueError('port overflow')\r\n return v\r\n```\r\n(the tcp protocol is a bad showcase about default port)\nGood point, `if v.port is not None and int(v.port) > 2**16` would be better. (is `port=0` allowed?)\r\n\r\n> rfc 793 explain ports are 16 unsigned bits\r\n\r\nPR welcome to add this check to all URL validation, I know technically it's a breaking chance, but I think a reasonable one, given that a higher port is invalid anyway.\nthe port 0 is tagged as reserved and should not be usable as such since most routers will reject it.\r\nIn a other hand in a lot of APIs port 0 mean \"use the first avaiable socket\" so I would say yes.\r\n\r\nI'll work on a PR within a few days (this weekend I hope if I have time)\nmakes sense to allow 0, also makes the check easier.\r\n\r\n> I'll work on a PR within a few days (this weekend I hope if I have time)\r\n\r\nThanks so much\nI'm currently working on a PR,\r\nlooking at the sources of networks I have few questions about some design choices\r\n\r\nShould I open news issues for each or asking here is fine ?\r\n":1,"Hi @art049 \r\nYes you're right. Since #1971 has been solved, this is the expected behaviour but it seems we update only the current field and not all. I can make a quick fix if you want should take couple of minutes":1,"I recently ran into this as well, and it certainly was unexpected to me. I ended up writing a small patch to the metaclass which removes overridden validators post-hoc. I post it below in case it is useful to others.\r\n\r\n```python\r\nfrom pydantic import BaseModel\r\nfrom pydantic.main import ModelMetaclass\r\n\r\ndef remove_overridden_validators(model: BaseModel) -> BaseModel:\r\n \"\"\"\r\n Currently a Pydantic bug prevents subclasses from overriding root validators.\r\n (see https://github.com/samuelcolvin/pydantic/issues/1895)\r\n This function inspects a Pydantic model and removes overriden\r\n root validators based of their `__name__`.\r\n Assumes that the latest entries in `__pre_root_validators__` and\r\n `__post_root_validators__` are earliest in the MRO, which seems to be\r\n the case.\r\n \"\"\"\r\n model.__pre_root_validators__ = list(\r\n {validator.__name__: validator\r\n for validator in model.__pre_root_validators__\r\n }.values())\r\n model.__post_root_validators__ = list(\r\n {validator.__name__: (skip_on_failure, validator)\r\n for skip_on_failure, validator in model.__post_root_validators__\r\n }.values())\r\n return model\r\n\r\nclass PatchedModelMetaclass(ModelMetaclass):\r\n def __new__(*args, **kwargs):\r\n model = ModelMetaclass.__new__(*args, **kwargs)\r\n return remove_overridden_validators(model)\r\n```\r\nThe following bit of code tests that it works as expected:\r\n```python\r\nfrom pydantic import BaseModel, root_validator\r\n\r\nclass A(BaseModel):\r\n# class A(BaseModel, metaclass=PatchedModelMetaclass):\r\n a: int\r\n @root_validator(pre=True)\r\n def pre_root(cls, values):\r\n print(\"pre rootA\")\r\n return values\r\n @root_validator(pre=False)\r\n def post_root(cls, values):\r\n print(\"post rootA\")\r\n return values\r\n\r\nclass B(A):\r\n @root_validator(pre=True)\r\n def pre_root(cls, values):\r\n print(\"pre rootB\")\r\n return values\r\n @root_validator(pre=False)\r\n def post_root(cls, values):\r\n print(\"post rootB\")\r\n return values\r\n\r\n# This prints only from the validators in B if PatchedModelMetaclass is used\r\nB(a=1)\r\n```":1,"Off the top of my head, I don't know.\r\n\r\nThat's a config setting called `copy_on_model_validation` try setting it to false and seeing if that avoids a copy that causes the problem.\n`copy_on_model_validation` didn't change things. I whittled the setup down to the minimum reproducible case:\r\n\r\n```py\r\nfrom uuid import UUID, uuid4\r\nimport sqlalchemy as sa\r\nimport sqlalchemy.dialects.postgresql as pg\r\nfrom pydantic import BaseModel as _BaseModel\r\nfrom sqlalchemy.ext.declarative import declarative_base\r\n\r\nclass CommonBase(_BaseModel):\r\n\r\n id: UUID = sa.Column(pg.UUID(as_uuid=True), primary_key=True, default=uuid4)\r\n\r\n class Config:\r\n copy_on_model_validation = False\r\n\r\nBaseModel = declarative_base(cls=CommonBase)\r\n```\r\n\r\nI also updated to pydantic 1.9.1 without change 🤔 \n1.9.1 hasn't changed `smart_deepcopy` so that wouldn't make a difference.\r\n\r\nReally I don't think it's correct for the sqlalchemy type to be raising an error on `__bool__`, but I get why they want to.\r\n\r\nI think the best solution would be to catch errors like this in `smart_deepcopy` and just fall back to using `deepcopy`, but I wonder whether even deep copy can cope with this type?\r\n\r\nSomething like \r\n\r\n```py\r\ndef smart_deepcopy(obj: Obj) -> Obj:\r\n \"\"\"\r\n Return type as is for immutable built-in types\r\n Use obj.copy() for built-in empty collections\r\n Use copy.deepcopy() for non-empty collections and unknown objects\r\n \"\"\"\r\n\r\n obj_type = obj.__class__\r\n if obj_type in IMMUTABLE_NON_COLLECTIONS_TYPES:\r\n return obj # fastest case: obj is immutable and not collection therefore will not be copied anyway\r\n try:\r\n if not obj and obj_type in BUILTIN_COLLECTIONS:\r\n # faster way for empty collections, no need to copy its members\r\n return obj if obj_type is tuple else obj.copy() # type: ignore # tuple doesn't have copy method\r\n except (TypeError, ValueError, RuntimeError):\r\n # do we really dare to catch ALL errors? Seems a bit risky\r\n pass\r\n return deepcopy(obj) # slowest way when we actually might need a deepcopy\r\n```\r\n\r\nWhat do you think?\r\n\r\nPR welcome, but I'm not sure when I'll get around to it - I'm currently flat out on pydantic-core getting ready for pydantic v2.\r\n\r\nBut at least your issue has made me think about how we deal with deepcopy in v2 😄 .\nper their [docs](https://docs.sqlalchemy.org/en/14/changelog/migration_06.html)\r\n\r\n> Code that wants to check for the presence of a ClauseElement expression should instead say:\r\n> `if expression is not None:`\r\n> ` print(\"the expression is:\", expression)`\r\n\r\nSo could this perhaps be fixed by changing the smart deep copy line to\r\n\r\n```py\r\nif obj is None and obj_type in BUILTIN_COLLECTIONS:\r\n```\r\n\r\nDoes this method expect other `obj` references that are falsy rather than `None`? if so, perhaps this:\r\n\r\n```py\r\nif (obj is None or not obj) and obj_type in BUILTIN_COLLECTIONS:\r\n```\nThat doesn't work, `None` is already covered by the `IMMUTABLE_NON_COLLECTIONS_TYPES` check above, and this line is using falsy as a proxy for empty on iterable types, so a `None` check is different.\nIsn't the immutable collection type check covering `None` on the `obj_type`, not `obj`? Isn't the raise happening on the `not obj` statement where sqlalchemy added the` __bool__` override?\nI'm not sure what you mean, but neither of your code suggestions will work. Best to try it and see what happens.\nYou were right, my train of thought would have required a quite ugly double negative to work. I was only trying to avoid catching errors, but I suspect your proposed approach is the cleanest and safest. Will submit a pr":1,"Since we will be releasing 1.0 soon, might even do that in a non-backward compatible way to simplify the logic.":1,"after a debate today with a fellow programmer I had my eyes opened to the fact that pascal case is a type of camel case... so the naming isn't wrong.\r\n\r\nI think ill submit a PR of the second option, as I'm sure I'm not the only one that would make use of the `to_lower_camel()` function.":1,"@gcoter Sounds good! Let's do that!\r\n\r\nUnfortunately, we don't have the capacity for this right now as well :slightly_frowning_face: So it might have to wait until someone has time for it. \n@gcoter Btw, i think you can already do that using your ssh config:\r\n```\r\nHost example.com\r\n ForwardAgent no\r\n```\nHi @efiop, thanks for your answer! I tried to modify `ForwardAgent` but it doesn't seem to work in my case...\nI will try to make the PR myself":1,"Hi @tommilligan \r\nThe thing is we can't do anything about it because python changes `Union[A]` into `A` at interpretation time.\r\n```py\r\nfrom typing import Union\r\nclass A: ...\r\nassert Union[A] is A\r\n```\r\nSo at runtime, pydantic has no way to know `A` was supposed to be a `Union`\nAh, that makes sense. I was about to start poking to see if the simplification was internal to `pydantic` or not, but if it's at a higher layer I'll give it up as a lost cause.\r\n\r\nWould you accept a PR noting this as an edge case in the documentation/error message?\r\n\r\nI suppose the workaround is to add a dummy second type into the union, or just to remove the discriminator until it is required.\r\n\r\nFor documentation forward compatibility, we were using [openapi-schema-pydantic](https://github.com/kuimono/openapi-schema-pydantic), which now collides with the `discriminator` Field property nicely. But that's not your problem! I'll file a bug over there now.\nDocumentation PRs are always welcome :)":1,"@pared\r\nHi, I'd like to look into it this weekend. And now are asking for some advice.\r\n\r\nAccording to [Git](https://git-scm.com/docs/git-check-ignore).\r\nIt has `-q`, `-v`, `--stdin`, `-z`, `-n`, `--no-index` arguments. \r\n\r\nAmong them, I consider `-v`(show details, the last pattern matches) `--no-index` (without this ignore-check would ignore those files already added in cache) most required.\r\n\r\nThen, `--stdin` is very helpful at debugging, `-q` is a default parameter. `-z` is used when we are about to output to files or use it in scripts. At last `-n` is an optional I think but is easy to implement.\r\n\r\nSo, at first, I'd like to implement `-v`, `-q`, `-n`, and `--no-index` first, and `--stdin` at the next step. \r\nBesides these, Maybe `-a, --all` which shows all of the patterns matches the files instead of only the last one are useful?\r\n\r\n\n@karajan1001 \r\nIll try to provide as much info as I am able:\r\n1. `-q` - I think that if we are to use the logger to display the information, the only important thing to implement is proper return code on command. `quiet` behavior is handled by [default parser](https://github.com/iterative/dvc/blob/5ed832077df8de445c1bac20fadc93b8d9d14d31/dvc/cli.py#L139)\r\n\r\n2. `--no-index` - I am not sure whether this one is vital. In my understanding, in git, it can be used to verify whether some element would be ignored if it was not already added to the index. So there is a kind of superiority of index over the workspace. In DVC however, if you put something into the `.dvcignore`, and run `dvc status`, DVC will pick it up and report your dir as changed, even if it is not. But from the point of view of DVC it did change because you \"deleted\" particular file. So I think in this point DVC differs from git in its operating principles and might not require `--no-index` option. Though if you have some other perspective, please share, I might be missing something here.\r\n\r\nSo, for now, if you want to implement a few features, I think `-v`, `-q`, `-n` will already be super-useful. Just a note though, please don't consider it as a must. It will be awesome even if you were able to do just `dvc check-ignore` returning `1/0`.\r\n\r\nIn next steps `--stdin` would be great and nicely matching other command-line helpful options, like `--show-vega` for `plots` command. `-a` also sounds awesome.\r\n\r\nPlease ping me if you want me to extend some parts.\n@pared \r\nThank you, \r\n1. For `-q`. I agreed, the only thing need to take care is the return number, non-zero return number may cause some report process. In Git\r\n> 0:One or more of the provided paths is ignored.\r\n> 1:None of the provided paths are ignored.\r\n\r\n2. For `--no-index`, I had tried on my computer, seems that it is vital for Git but not for DVC. The reason lies in the differences in treating ignored files between Git and DVC. In Git `.gitignore` changed didn't influence files existing in the cache, Ignore check skips them. But for DVC, ignored check on files whether added to cache or not. \r\n\r\n----- \r\nIn conclusion without `--no-index` Git can't check files already in the cache, while for DVC actually we are always in a `--no-index` mode.\r\n\r\nSo, two steps:\r\n\r\n- [ ] basic functions `-v`, `-q`, `-n`\r\n- [ ] advanced functions `-a`, `--stdin`\r\n\r\n":1,"@RomanVeretenov Does it happen after specific dvc command?\n@RomanVeretenov Could you show us `git check-ignore $(pwd)/.dvc/tmp` output, please? Is there anything special about your repo location?\n@efiop it happens on older repos. Try to clone our get started and run a few commands (pull, checkout, etc).\n> @RomanVeretenov Could you show us `git check-ignore $(pwd)/.dvc/tmp` output, please? Is there anything special about your repo location?\r\n\r\noutput is empty\n@shcheklein It does, but it only adds the missing `/tmp`(as it is supposed to be), not adding it multiple times as in this issue. I am not able to reproduce the issue.\r\n\r\n@RomanVeretenov Ok, that is bad, it means that git is not seeing that `/tmp` in `.gitignore` or not understanding it right. Is there anything special about the location that your repo is located in?\r\n\r\nCould you show:\r\n```\r\n$ python -c 'import os; print(os.getcwd())'\r\n$ python -c 'import os; print(os.path.realpath(os.getcwd()))'\r\n```\r\nplease?\r\n\r\nSo far this looks like there is something wrong with your environment or git specifically.\n```\r\n$ python -c 'import os; print(os.getcwd())'\r\n/home/ds\r\n$ python -c 'import os; print(os.path.realpath(os.getcwd()))'\r\n/home/ds\r\n```\r\n\r\nyep, the repo root is '/home/ds' =)\n@RomanVeretenov Using `/home/ds` is questionable, but nothing functionally wrong about it :slightly_smiling_face: Looks alright. Maybe you have `.dvc/` gitignored somewhere or something? \r\n\r\nNeed to check your `.gitignore`s in `/home` and `/home/ds` to see if they are sane(maybe they have something like `!!.dvc/tmp`, `!!tmp` or something that forces git to not ignore `.dvc/tmp`. Would also check global gitignore rules, if you have those.\nThere is no /home/.gitignore\r\nAlso I have no global gitignore\r\nAlso .git/info/exclude is empty\r\n\r\n```\r\n/home/ds % cat .gitignore\r\n\r\n*.jpg\r\n*.JPG\r\n*.png\r\n*.PNG\r\nextracted.csv\r\n```\r\n\r\nalso I have recursively listed all gitignore's \r\nNone of them but .dvc/.gitignore conatins tmp\r\n\r\n```\r\nfind . -name '.gitignore' -exec echo {} \\; -exec grep tmp {} \\;\r\n... here goes gitignores from all nested folders\r\n./.dvc/.gitignore\r\n/tmp\r\n/tmp\r\n./.gitignore\r\n...\r\n```\r\n\r\nEach `dvc status` call adds a /tmp to the end of .dvc/.gitignore\n@RomanVeretenov Could you try to reproduce it with a newly created dvc project? E.g.\r\n```\r\nmkdir myrepo\r\ncd myrepo\r\ngit init\r\ndvc init\r\ngit add .\r\ngit commit -m \"init\"\r\ndvc status\r\ngit status\r\n```\r\n\r\nI'm still not able to reproduce your issue, most likely there is something off with your environment, can't put my finger on anything yet.\n> @RomanVeretenov Could you try to reproduce it with a newly created dvc project? E.g.\r\n> \r\n> ```\r\n> mkdir myrepo\r\n> cd myrepo\r\n> git init\r\n> dvc init\r\n> git add .\r\n> git commit -m \"init\"\r\n> dvc status\r\n> git status\r\n> ```\r\n> \r\n> I'm still not able to reproduce your issue, most likely there is something off with your environment, can't put my finger on anything yet.\r\n\r\nIt works ok on a clean repo\r\n\r\n```\r\n ~/code/myrepo/.dvc\r\n % cat .gitignore\r\n/config.local\r\n/updater\r\n/lock\r\n/updater.lock\r\n/tmp\r\n/state-journal\r\n/state-wal\r\n/state\r\n/cache\r\n```\r\n\r\nafter executing all given commands\r\n\n> It works ok on a clean repo\r\n\r\n@RomanVeretenov So there is something with your .gitignores in the rest of the project. You'll have to take a look and see what is different between it and a clean one. It might be .gitignores somewhere, might be the fact that you are in `/home/ds` (esp if you are working as `ds` user), might be that you don't have permissions to access some files (again, if your git project is not owned by you and you don't have shared mode enabled in git config). But it is clear that this is not dvc-issue, it is your git repo and environment that are not quite right. Sorry, but you are pretty much on your own right now, as I can't put my finger on anything specific :slightly_frowning_face: \nPlease let us know how it goes. I'll close this issue for now.\n@RomanVeretenov \r\n\r\nWhen `/tmp` is already part of the `.dvc/.gitignore`:\r\n\r\nwhat does `git check-ignore \".dvc/tmp\"` return?\r\n\r\nalso, what will the script like this return in your case:\r\n\r\n```\r\nfrom dvc.scm.git import Git\r\ngit = Git()\r\ngit._ignored(\".dvc/tmp\")\r\n```\r\n\r\nI wonder if it's some yet-another-gitpython's-bug.\n@shcheklein Already checked: https://github.com/iterative/dvc/issues/3561#issuecomment-606737795 , it is not gitpython.\n@RomanVeretenov @efiop \r\n\r\n> @shcheklein Already checked: #3561 (comment) , it is not gitpython.\r\n\r\nsorry, missed that ... this is really weird!\r\n\r\n@RomanVeretenov can you just do it all manually. Save the old `.dvc/.gitignore` somewhere, create a new one with a single entry `/tmp` and and run from the project's root `git check-ignore .dvc/tmp`? \r\n\r\nDo you use submodules or any other advanced Git's stuff?\nWill re-check everything next week\nI was having this issue and discussed it with Ivan on Discord. Here is part of our conversation.\r\n\r\n> For some reason on my repo, running\r\n> echo \"test 1\" >> models/README.md\r\n> dvc add models\r\n> echo \"test 2\" >> models/README.md\r\n> dvc add models\r\n> \r\n> Is appending models to .gitignore twice. I tested it on a new repo and you're right it doesn't append it more than once. I'll try to reset dvc and see if that works\r\n\r\n\r\nI tried DVC destroy and started again. Didn't help. The only thing that worked is that I started with a clean models folder, added to dvc/git/.gitignore, and then added the data to it.\nFrom https://discordapp.com/channels/485586884165107732/563406153334128681/703247236368302091\r\n\r\n```\r\ngit init\r\nmkdir models\r\necho \"test 1\" >> models/README.md\r\ngit add models/README.md\r\ngit commit -m \"Add requirements file\"\r\ngit checkout -b b1\r\ndvc init\r\ndvc add models\r\ngit add models.dvc .gitignore\r\ncat .gitignore\r\necho \"test 2\" >> models/README.md\r\ndvc add models\r\ncat .gitignore\r\n```\r\n\r\nSo looks like we should handle it better on DVC side. I suppose @RomanVeretenov had something similar. Reopening\nOk, looks like we broke `is_tracked` during one of the rounds of optimizing dvc for a use case with many thousands of dvc-files.\r\n```\r\nPython 3.7.0 (default, Dec 26 2018, 22:48:20)\r\n[GCC 7.3.0] on linux\r\nType \"help\", \"copyright\", \"credits\" or \"license\" for more information\r\n>>> from dvc.scm.git import Git\r\n>>> g = Git(\".\")\r\n>>> g.is_tracked(\"tests/__init__.py\")\r\nTrue\r\n>>> g.is_tracked(\"tests\")\r\nFalse\r\n>>> g.is_tracked(\"tests/\")\r\nFalse\r\n>>> g.is_tracked(\"tests/func\")\r\nFalse\r\n>>> def func(path):\r\n... return bool(g.repo.git.ls_files(path))\r\n...\r\n>>> func(\"tests\")\r\nTrue\r\n>>> func(\"tests/\")\r\nTrue\r\n>>> func(\"tests/unit\")\r\nTrue\r\n```\r\n`func` represents an old implementation and works like charm. Need to look into it. And, more importantly, add better tests for it.\r\n\r\nEDIT: it was an older bug after all.\nBig thanks to @ammarasmro for investigating! :pray: \nGlad I could help :)":1,"@vdwees I've traced the source of this issue to [this line](https://github.com/samuelcolvin/pydantic/blob/5015a7e48bc869adf99b78eb38075951549e9ea7/pydantic/schema.py#L833).\r\n\r\nThe problem here is that `Optional[X]` is not considered by python to be a `type`. I definitely don't think the way it is currently handled is ideal, but it might be somewhat involved to fix this properly.\r\n\r\nFor now, here's a workaround:\r\n```python\r\nfrom pydantic import BaseModel, Schema, ConstrainedInt\r\nfrom typing import Optional\r\n\r\nclass ConInt3(ConstrainedInt):\r\n ge = 3\r\n\r\nclass MyModel(BaseModel):\r\n my_int: Optional[ConInt3] = Schema(...)\r\n\r\nprint(MyModel.schema())\r\n# {'title': 'MyModel', 'type': 'object', 'properties': {'my_int': {'title': 'My_Int', 'minimum': 3, 'type': 'integer'}}}\r\n\r\nprint(MyModel(my_int=2))\r\n\"\"\"\r\npydantic.error_wrappers.ValidationError: 2 validation errors for MyModel\r\nmy_int\r\n ensure this value is greater than or equal to 3 (type=value_error.number.not_ge; limit_value=3)\r\nmy_int\r\n value is not none (type=type_error.none.allowed)\r\n\"\"\"\r\n```\r\n\r\n-------\r\n\r\n@samuelcolvin I'm not sure whether it would be better to modify the `get_annotation_from_schema` function to deal with the whole `typing` introspection rigamarole (like in, e.g., `Field._populate_sub_fields`), or to just require more careful handling (like in the \"workaround\" I provided above). Thoughts?\nThanks for reporting. Definitely looks like a bug, I'll look into in and see what I can do.\nFirstly thank you both for your contributions to this library, and +1 for resolving this issue if possible.\r\n\r\n@dmontagu I have tried your workaround but I believe it has uncovered a second bug - if you look at your code snippet the schema now raises two issues when I would expect one (i.e. I assume it should not complain that the optional value is not none).\r\n\r\nFor a simpler example (using Pydantic 0.32.2)on MacOSX:\r\n\r\n```\r\n>>> from pydantic import BaseModel, PositiveInt\r\n>>> from typing import Optional\r\n>>> class ExampleModel(BaseModel):\r\n... foo: Optional[PositiveInt]\r\n...\r\n>>> ExampleModel(foo=0)\r\npydantic.error_wrappers.ValidationError: 2 validation errors for ExampleModel\r\nfoo\r\n ensure this value is greater than 0 (type=value_error.number.not_gt; limit_value=0)\r\nfoo\r\n value is not none (type=type_error.none.allowed)\r\n```\nhi @dannymilsom I'm not clear what second bug you've uncovered? Please can you elaborate.\n@dannymilsom what's happening is that it's showing you, for each option in the union, why it can't be that option. The first option was PositiveInt, which fails. The second is None, which also fails (obviously).\r\n\r\nThis is because `Optional[PositiveInt]` is basically the same as `Union[PositiveInt, None]`.\r\n\r\n@samuelcolvin I feel like maybe some of this stuff has changed in v1 anyway; not sure whether the error messages still look the same? Either way, I don't think this is a buggy error message, just a slightly confusing one.\n@dmontagu yes, you're right on all: it's not an error and it's clearer in v1.\r\n\r\nIt's also not related in anyway to this issue.":1,"Probably works because of some `Enum` class magic, but could be reworked to:\r\n```py\r\nif card_number.brand in (PaymentCardBrand.visa, PaymentCardBrand.mastercard)\r\n```\nI guess it depends if equality is acceptable compared to identity?\nI don't think magic works with is, and I'm kinda glad of that:\r\n```\r\n>>> from enum import Enum\r\n>>> class CardType(Enum):\r\n... Diners = 1\r\n... Visa = 2\r\n... MasterCard = 3\r\n...\r\n>>> CardType.Visa is (CardType.MasterCard or CardType.Visa)\r\nFalse\r\n```\nGood to confirm.\nAssuming this is resolved. \nSadly not resolved, code is still\r\n```python\r\nif card_number.brand is (PaymentCardBrand.visa or PaymentCardBrand.mastercard):\r\n```\r\n\r\nwhich won't work if `card_number.brand` is `PaymentCardBrand.mastercard`.\nYes, I was just confirming the logic is broken. @mike-hart you might want to submit a PR referencing this issue with the fix.\nThe use of `x is (y or z)` is just a mistake, it simplifies to `x is y` if y is truey or `x is z` otherwise. In this case since `PaymentCardBrand.visa` is truey we're effectively just doing `brand is PaymentCardBrand.visa`.\r\n\r\nI'll replace it with an `in` check.\r\n\r\nA bit more background on enums:\r\n* Identity checks work with the actual enum member but not with the enum value\r\n* equality checks work with both the enum member and the enum value, but **only if** the enum inherits from the correct type as well as `Enum`.\r\n\r\n```py\r\nclass PaymentCardBrand(str, Enum):\r\n amex = 'American Express'\r\n mastercard = 'Mastercard'\r\n visa = 'Visa'\r\n other = 'other'\r\n\r\nb = PaymentCardBrand.visa\r\nb is PaymentCardBrand.visa\r\n#> True\r\nb == PaymentCardBrand.visa\r\n#> True\r\n\r\nb = 'Visa'\r\nb is PaymentCardBrand.visa\r\n#> False\r\nb == PaymentCardBrand.visa\r\n#> True (This would not work with the current PaymentCardBrand which doesn't inherit from str)\r\n```\r\n\r\nI don't know if `card_number.brand` can be a string or only a `PaymentCardBrand`, but better to fix anyway.":1,"You wrote `Config.field` for model B instead of `Config.fields` hence the difference.\r\nNow you're right the output is not the expected one. I'll open a fix shortly":1,"We used to clone the repo if `rev` was provided before, nowadays we don't do that (and hope `scm` copes with that), but we don't properly initialize them. \r\nThe easy fix might be to rollback to that behaviour, or fix this initialization process. \nAnother user running into this https://discordapp.com/channels/485586884165107732/485596304961962003/831501540484972564\nIf we're counting the number of users running into this: +1 :stuck_out_tongue: ":1,"@bharathc346, we cannot have two `foreach` as it's not supported in YAML format.\r\nWe could support nested `foreach` as following:\r\n```yaml\r\n\r\nstages:\r\n build:\r\n foreach: ${models}\r\n do:\r\n foreach: ${features}\r\n do:\r\n cmd: >- \r\n python script.py\r\n --model ${item_0}\r\n --features ${item_1}\r\n```\r\n\r\nBut, as you can see, this requires too much indentation. Though, this is what we have in mind right now.\r\n\r\n@johnnychen94 suggested introducing something similar to Github's `matrix` or `travis`'s `env` in https://github.com/iterative/dvc/issues/3633#issuecomment-736508018. But, we are not sure if `matrix` is more intuitive to our users than the loops. With matrix, it'd look something like following:\r\n```yaml\r\n\r\nstages:\r\n build:\r\n matrix:\r\n - ${models}\r\n - ${features}\r\n do:\r\n cmd: >- \r\n python script.py\r\n --model ${item_0}\r\n --features ${item_1}\r\n```\r\n\r\nRegarding `item_0`/`item_1` naming, I think it might be better to do similar to what `Ansible` does.\r\nSo, `item_0` will be accessible as `item[0]` and `item_1` as `item[1]`. `item` will just be a list. Similarly, `key[0]`, `key[1]`, etc. This might make it confusing with `item` and `key` as they are now a list, but I don't have any good ideas for now.\r\n\r\nAnyway, @bharathc346 thanks for creating the issue. Let's hear some feedback for 2.0 change and given enough interests, we'll come to it. Thanks.\nI see. I like @johnnychen94 comment about introducing the github matrix. But I think any solution for nested interpolation would be great. Thanks for the detailed comment\n@bharathc346, ahh, looks like I used the wrong term. It should be nested `foreach`. \nUpvoted, that definitely something that would be nice to have.\r\n\r\nIntuitively I was doing something like that:\r\n```yaml\r\nstages:\r\n build:\r\n foreach:\r\n - fr:\r\n - a\r\n - b\r\n - en:\r\n - a\r\n - b\r\n do:\r\n ...\r\n```\r\n\r\nHowever, I feel the `matrix` is more readable. But I'd be ok with a nested `foreach` too.\nI am definitely interested in such a feature. If I were to vote on the naming convention, I would go for `matrix` as `foreach` means to me some sort of a parallelizable loop (for - each).\r\n\r\nFor the keys and items, I would stick with what is well done with the current foreach loop, meaning:\r\n\r\n - if a list is provided, then the var is `item` and since there is a matrix, `item` is a list:\r\n\r\n```yaml\r\nstages:\r\n build:\r\n matrix:\r\n - [\"us\", \"fr\", \"gb\"]\r\n - [128, 256, 512]\r\n do:\r\n cmd: >-\r\n python script.py\r\n --model ${item[0]}\r\n --features ${item[1]}\r\n```\r\n\r\n - if a dict is provided, `item` is a dict to access the values by their names (this second option improves readability and I could even vote to enforce it)\r\n\r\n```yaml\r\nstages:\r\n build:\r\n matrix:\r\n model: [\"us\", \"fr\", \"gb\"]\r\n features: [128, 256, 512]\r\n do:\r\n cmd: >-\r\n python script.py\r\n --model ${item.model}\r\n --features ${item.features}\r\n```\nHi, any updates on this feature? I would be really interested in this\nI am glad to work on it as well if we have a go from the dvc team \nThe matrix loop is a very trivial case in that it introduces a dense parameter grid. There will always be a need to run a \"filter\" on this grid to reduce unnecessary tasks.\r\n\r\nIt would be nice if DVC defines an interchangeable protocol for multiple parameterization tasks so that people can write their own task generation script when needed. The \"params.yaml\" example I provide in https://github.com/iterative/dvc/issues/3633#issuecomment-736508018 is a very naive version of the interchangeable protocol. It would be very trivial work to dump \"matrix\" definition into something like this, as long as the protocol is well-defined.\r\n\r\nhttps://github.com/iterative/dvc/issues/5795 should be also fixed to enable wide usage of this requested feature.\n### Overlap with dvc exp run \r\n\r\nThere is some overlap between this kind of parametrized loop and `dvc exp run --set-param`. The current `foreach` approach creates many separate stages, while `dvc exp run` creates many variations of the same stage. @johnnychen94 mentioned concurrent execution in another thread, which `dvc exp run` is already starting to tackle. If it were possible to programmatically define the set of experiments to run with `dvc exp run`, would people still need `matrix`?\r\n\r\n### Nested loop syntax\r\n\r\nThere seems to be consensus that the `matrix` syntax makes sense. Personally, I agree with @ClementWalter that enforcing a dict structure is most readable.\r\n\r\nAdding `matrix` might make it challenging to explain the difference between `foreach` and `matrix`. This also relates generally to how to balance complexity and flexibility in defining DAGs (see https://github.com/iterative/dvc/discussions/5646#discussioncomment-874316).\n@dberenbaum, For myself, the `foreach` is a useful functionality when I'm doing some text classifications. In this work, two billion items need to be classified into about 5000 child categories inside 50 parent categories. The project has two levels, in the first one I trained a model to classify items into parent categories, and in the second I use `foreach` to train a separate model for the classification of the child categories for each parent category. It could not be replaced by `exp` or other functionalities.\r\n\r\nSo, If we are facing a project with an even more level of structure, then a nested loop might be an unavoidable solution.\n@dberenbaum I think `matrix` or nested `foreach` still make sense, even with more dynamic parameter definitions in `dvc exp`. We use \"foreach stages\" to define different models (similar model but for different countries and products for example), while using dvc experiments for trying out different parameters for those models. There is a logical difference, and it would not be optimal to start mixing those concepts.\r\n\r\nAnd of course upvoting this feature request 👍🏻 \nHere is another upvote.\r\n\r\nEither `matrix` or nested `foreach` would help me align the structure of the pipeline to the natural structure of the experiment.\r\n\r\nAlthough I am fairly new to DVC, I keep running into limitations. I wonder if DVC might get more mileage by leveraging existing workflow systems (such as Snakemake and NextFlow) and focusing on what DVC does best, which is managing data versions. I guess I could trigger a whole Snakemake workflow as one stage of a DVC pipeline, and then specify which parameters, dependencies and outputs I want to track with DVC. I'm just wondering out loud if it might be more efficient to better integrate DVC with other workflow systems (such as automatically detecting parameters, dependencies and outputs) rather than focus on making DVC pipelines more flexible.\nThis is my most wanted feature. Just adding my perspective, as I have a collection of models I want to run on a collection of datasets. If I could nest the `foreach`, my config size would literally lose an order of magnitude in terms of line count.\n\nAs for whether we should use `matrix` instead, I think although it's visually cleaner it would have to be documented as a separate feature, which feels bloated. Whereas uses nested `foreach`, although less visually appealing, is a more intuitive extension of the concept (i.e. the first thing I tried after ready about DVC's looping). There would be no way someone would naturally change their `foreach` to `matrix`.\nJust to comment here, that the \"nested loop\" is just \"one way\", of tuning the hyper parameters automatically.\r\nThere are others (random search or sobol sequences) and ideally DVC should allow each of them.\r\n\r\nAllowing \"multiple param files\" in one go, might be a middle ground. (#7891 )\r\n\nChiming in with support for this feature! For context, see [this trickery](https://github.com/iterative/dvc/issues/7093#issuecomment-1581417045) I'm currently doing with YAML anchors to serve this same purpose, and which is at risk of being broken after 3.0 release.\r\n\r\nI think it's definitely possible that some version of `matrix` could serve my needs (what I'm trying to do is really not that complicated), thought it would depend on the details of the implementation. For example, would each \"coordinate\" in the constructed matrix need to be a simple scalar, or could one construct a matrix from e.g.\r\n\r\n```yaml\r\nmatrix:\r\n - [foo, bar]\r\n - - feature: a\r\n type: json\r\n - feature: b\r\n type: npz\r\n```\r\n\r\nI use maps like that a lot, so that feels pretty important.\r\n\r\nAs an aside, when combined with hydra, this could possibly allow for \"toggling\" certain pipeline stages. In the example below, you could set `is_enabled` to an empty list to disable that stage—assuming that `matrix` doesn't require non-empty lists—or a list of a single value to turn it on. I actually do this currently with `foreach` and empty lists/maps.\r\n```yaml\r\nstage_name:\r\n matrix:\r\n - ${features}\r\n - ${is_enabled}\r\n do:\r\n ...\r\n```\n> ```yaml\r\n> matrix:\r\n> - [foo, bar]\r\n> - - feature: a\r\n> type: json\r\n> - feature: b\r\n> type: npz\r\n> ```\r\n\r\nWould you mind continuing that example with the `do:` part? It's not entirely clear to me how it would look. I'd prefer to use the convention suggested by @ClementWalter above where each of those sections has a key to identify it, so maybe it would look more like:\r\n\r\n```yaml\r\nmatrix:\r\n - name: [foo, bar]\r\n - config: \r\n - feature: a\r\n type: json\r\n - feature: b\r\n type: npz\r\n```\r\n\r\nI _think_ that will also make it easier to reference those items in the `do:` section, but that's where I'd like to know how you think that would look.\n> Would you mind continuing that example with the `do:` part?\r\n\r\nI like the explicit naming, though you then don't need a list at the top level:\r\n```yaml\r\nstage_foo:\r\n matrix:\r\n name: [foo, bar]\r\n config:\r\n - feature: a\r\n type: json\r\n - feature: b\r\n type: npz\r\n do:\r\n cmd: echo ${item.name} ${item.config.feature}\r\n```\n@skshetry Do you think this could eventually replace `foreach` altogether, or do you think we would need to keep both?":1,"+1 for `dvc list` :slightly_smiling_face: \n@efiop @jorgeorpinel another option is to do `dvc ls` and it should behave exactly like a regular `ls` or `aws s3 ls`. Show _all_ the files (including hidden data) by specifying a Git url. This way you can control the scope to show (by not going into all directories by default) - also you can see your data in the context (other files) with an option to filter them out.\r\n\r\nOn the other hand it can be good to show just a list of all DVC outputs. It can be done with `dvc ls --recursive --outputs-only` for example.\r\n\r\nWhat do you think?\r\n\r\nIn general I'm +100 for `dvc list` or something similar :)\nClarification: `dvc list` should work on dvc repositories. E.g. `dvc list https://github.com/iterative/dvc` should list `scripts/innosetup/dvc.ico`, etc.\n@efiop can we change the priority to p1 as we discussed because it's part of the get/import epic story?\n@shcheklein Sure, forgot to adjust that. Thanks for the heads up!\n@shcheklein I'm not sure about the `dvc ls` name if all we want is to list data artifacts specifically (not all files as you propose).\r\n\r\n> ...you can see your data in the context (other files) with an option to filter them out.\r\n\r\nWill most users need this? The problem I think we need to solve is that it's hard to use `dvc get` and `dvc import` without a list of available data artifacts. Showing all Git-controlled files may or may not be useful but can be done by [existing means](https://git-scm.com/docs/git-ls-tree).\r\n\r\n> by specifying a Git url...\r\n\r\nWhat I get from that is: `dvc list [url]` where `url` can be a file system path or HTTP/SSH URL to a Git repo containing a DVC project (same as the `dvc get` and `dvc import` argument `url`) – and if omitted tries to default to the local repo (containing `pwd`).\r\n\r\n> This way you can control the scope to show (by not going into all directories by default)...\r\n\r\nI don't see how just the Git repo URL can control the scope to show. Would need a `path` argument for this I think (which could only accept directories) and/or a `--depth` option.\r\n\r\n> `dvc ls --recursive --outputs-only`\r\n\r\nToo complicated for users to remember if the main purpose of this new command is to list artifacts. Maybe `--recursive` though... (`aws s3 ls` for example isn't recursive by default, but has that option.)\r\n\r\nIn summary I think just `dvc list` or `dvc outs` is best.\r\nBut I agree we would need to consider the case where there are lots of outputs. Another solution (besides `path` arg and/or `--depth`, `--recursive` options) could be default pagination (and possibly interactive scrolling with ⬆️ ⬇️ – like a stdout pipe to `less`).\r\n[`aws s3 ls`](https://docs.aws.amazon.com/cli/latest/reference/s3/ls.html) on the other hand takes a simple approach: It has a hard limit of 1000 objects.\n> Clarification: `dvc list` should work on dvc repositories. E.g. `dvc list https://github.com/iterative/dvc` should list `scripts/innosetup/dvc.ico/etc`.\r\n\r\n@efiop yes, exactly. Extended example:\r\n\r\n```console\r\n$ dvc list https://github.com/iterative/dvc\r\nscripts/innosetup/dvc.ico\r\nscripts/innosetup/dvc_left.bmp\r\nscripts/innosetup/dvc_up.bmp\r\n```\r\n\r\nThis makes me think, maybe an output that combines the DVC-files (similar to `dvc pipeline list`) with their outputs could be most informative (providing some of the context Ivan was looking for). Something like:\r\n\r\n```console\r\n$ dvc list https://github.com/iterative/dvc\r\nscripts/innosetup/dvc.ico\t(from scripts/innosetup/dvc.ico.dvc)\r\nscripts/innosetup/dvc_left.bmp\t(from scripts/innosetup/dvc_left.bmp.dvc)\r\nscripts/innosetup/dvc_up.bmp\t(from scripts/innosetup/dvc_up.bmp.dvc)\r\n```\r\n\r\nUPDATE: Thought of yet another 😓 name for the command above: `dvc stage list --outs`\n@jorgeorpinel I think showing the full project in an ls-way is just more natural as opposed to creating our own type of output. There are few benefits:\r\n\r\n1. You don't have to use two interface to see the full picture - Github + `dvc list`. Instead you just use dvc and see the workspace. And can filter it if it's needed.\r\n2. It looks like it's beneficial for `dvc get` to handle regular Git files. Why not? It can be useful.\r\n3. Like I mentioned - single place in CLI, no need to go to Github to get the full picture.\r\n4. Just easier to understand since people are familiar with `ls` and intuitively can expect the result.\r\n\r\nThe idea is that by default it's not recursive, it's not limited to outputs only. You go down on your own if you need by clarifying path - the same way you do with ls, aws ls, etc.\r\n\r\n`ls`, `aws ls`, etc - they are all not recursive by default for a reason. In a real case the output can be huge and just won't make sense for you. People tend to go down level by level, or use recursive option when it's exactly clear that it's what they need.\r\n\r\nI really don't like making piping and less and complex interfaces part of the tool. You can always use `less` if it's needed. \n@shcheklein I concur only with benefit #1, so I can agree with showing all files but with an optional flag (which can be developed later, with less priority), not as the default behavior. Thus I wouldn't call the command `dvc ls` – since it's not that similar to GNU `ls`. I would vote for **`dvc outs`** or `dvc list`.\r\n\r\n> 2. It looks like it's beneficial for `dvc get` to handle regular Git files. Why not?\r\n\r\nBecause it can already be done with `git archive` (as explained in [this SO answer](https://stackoverflow.com/a/18331440/761963)).\r\n\r\n> 3... single place in CLI, no need to go to Github to get the full picture.\r\n\r\nThe \"full picture\" could still be achieved from CLI by separately using [git ls-tree](https://git-scm.com/docs/git-ls-tree).\r\n\r\n> The idea is that by default it's not recursive... You go down on your own if you need by clarifying path...\r\n\r\nI can also agree with this: Non-recursive by default sounds easier to implement. So, it would definitely also need an optional `dir` (path) argument and a `--recursive` option.\r\n\r\n> I really don't like making piping and less and complex interfaces part of the tool.\r\n\r\nAlso agree. I just listed it as an alternative.\r\n\r\n---\r\n\r\nAnyway, unless anyone else has relevant comments, I suggest Ivan decides the spec for this new command based on all the comments above, so we can get it onto a dev sprint.\np.s. my ~~(initial)~~ **updated** spec proposal is:\r\n\r\n```\r\nusage: dvc list [-h] [-q | -v] [--recursive] [--rev REV | --versions]\r\n url [target [target ...]]\r\n\r\npositional arguments:\r\n url URL of Git repository with DVC project to download from.\r\n target Paths to DVC-files or directories within the repository to list outputs\r\n for.\r\n```\nI think that this command (`dvc list`) should be able to get a revision, like `--rev tag1`.\r\nIts output should list the **checksums** of the output files on the given revision, as well as the **file path and name**. This would also allow an external tool to construct the right URL for downloading from a remote storage a certain revision of a datafile.\nThis may be related: https://github.com/iterative/dvc/issues/2067\n@jorgeorpinel @dashohoxha Few comments:\r\n\r\n1. `outs` is a terrible name. `output` is a super-confusing term when you want to list your `input` datasets :)\r\n2. `git-ls-tree`, other tools - that's the point you will need two or more tools to get the full picture, you will have mentally do this exercise of merging lists every time. Also, don't forget that we are dealing with a remote repo - `git-ls-tree` won't even solve this problem, unless you got clone the repo first, right?\r\n3. the same with `git-archive`. Github does not support it. And why would I want to know about it at all? Why don't we allow to download/import any files?\r\n4. Regarding `ls` similarity. In mind it's what `aws s3 ls` is doing, of `hadoop fs ls` and other similar systems. The utilize common and familiar names. And that's why it's important for it to behave the same way as ls. I don't see any reason why it can't be implemented this way.\r\n5. Re checksums - we don't want users to construct URLs because this way we expose internal logic (the way we store files) to them. Which is not a part of the public protocol (at least now). I totally understand the problem though. I think it can be part of the `dvc get` to generate an URL for you and part of the `dvc.api`.\n> (`dvc list`) should be able to get a revision, like `--rev tag1`...\r\n\r\nInteresting. Not sure its central to the command because you're not supposed to have knowledge about the repo when you use `dvc list`. But yes, it would definitely be a useful advance feature to have. Maybe also a flag to list available revisions for a specified output (e.g. `dvc list --versions model.pkl`).\r\n\r\n> 1. outs is a terrible name...\r\n\r\nYou're probably right but I'm just using our own terminology 😋 We would be listing outputs, basically. Anyway, I can agree with `dvc list` or even `dvc ls` if we go your route and list all files by default.\r\n\r\n> 3. the same with git-archive. Github does not support it...\r\n\r\nThere's special `https://raw.githubusercontent.com/user/repository/branch/filename` URLs you could construct and `wget` for GitHub. But yeah I guess it wouldn't hurt that `dvc get` can download regular files from any Git host. Opened #2515 separately.\n> Re checksums - we don't want users to construct URLs because this way we expose internal logic... I think it can be part of the `dvc get` to generate an URL for you and part of the `dvc.api`.\r\n\r\nDo you have in mind something like this?\r\n\r\n```console\r\n# return a list of data files, along with the corresponding `.dvc` file\r\ndvc get list\r\n\r\n# download a datafile\r\ndvc get \r\n\r\n# with option '-h, --show-hashes' display the corresponding hashes as well\r\ndvc get list --show-hashes\r\n\r\n# with option '-d, --show-download-url' display the corresponding URL\r\n# for direct download from the default remote storage\r\n# (maybe depends on the type of the remote storage)\r\ndvc get list --show-download-url\r\n\r\n# limit listing only to certain DVC-files\r\ndvc get list \r\n\r\n# etc.\r\n```\r\n\r\nThis would be useful too for an external tool.\r\n\r\nHowever when I think about a `dvc list` command I have in mind something like this:\r\n\r\n list\r\n> ```\r\n\r\nThis would actually need to be `dvc get list [url]` to adhere to DVC syntax but no, we're talking about a new, separate command (`dvc list`), not a new subcommand for `dvc get`. (It also affects `dvc import`, for example.)\r\n\r\nAlso I think we've established we want the list to be of all the regular files along with \"data files\" (outputs and their DVC-files), not just the latter.\r\n\r\n> ```console\r\n> dvc get list --show-hashes\r\n> ...\r\n> dvc get list --show-download-url\r\n> ```\r\n\r\nPlease open a separate issue to decide on adding new options to `dvc get` @dashohoxha.\r\n\r\n> ```console\r\n> # limit listing only to certain DVC-files\r\n> dvc get list \r\n> ```\r\n\r\nThis could be useful actually. Optionally specifying target DVC-files to the `dvc list` command could be an alternative for limiting the number of results.\nOK I hid some resolved comments and updated the proposed command spec in https://github.com/iterative/dvc/issues/2509#issuecomment-533019513 based on all the good feedback. Does it look good to get started on?\n@jorgeorpinel sounds good to me, let's move the spec to the initial message? \r\n\r\nAlso, would be great to specify how does output look like in different cases. Again, I suggest it to be have the same way as if Git repo is a bucket you are listing files in with `aws s3 ls`. May be it would be helpful to come with a few different outputs and compare them.\nOK spec moved to initial issue comment.\r\n\r\n> specify how does output look like in different cases...\r\n\r\nI also think copying the `aws s3 ls` output is a good starting point.\r\n\r\n### Hypothetical example outputs\r\n\r\nUsing file system paths as `url`:\r\n> See full example outputs in [dvc list proposal: output examples](https://gist.github.com/jorgeorpinel/61719795628fc0fe64e04e4cc4c0ca1c) Gist.\r\n\r\n```console\r\n$ cd ~\r\n$ dvc list # Default url = .\r\nERROR: The current working directory doesn't seem to be part of a DVC project.\r\n\r\n$ git clone git@github.com:iterative/example-get-started.git\r\n$ cd example-get-started\r\n$ dvc list .\r\nINFO: Listing LOCAL DVC project files, directories, and data at\r\n /home/uname/example-get-started/\r\n\r\n 17B 2019-09-20 .gitignore\r\n6.0K 2019-09-20 README.md\r\n...\r\n339B 2019-09-20 train.dvc\r\n5.8M └ out: (model.pkl)\r\n...\r\n\r\n$ dvc pull featurize.dvc\r\n$ dvc list featurize.dvc # With target DVC-file\r\n...\r\nINFO: Limiting list to data outputs from featurize.dvc stage.\r\n\r\n367B 2019-09-20 featurize.dvc\r\n2.7M └ out: data/features/test.pkl\r\n 11M └ out: data/features/train.pkl\r\n```\r\n\r\n> NOTE: The latter case brings up several questions about how to display outputs located in a different dir as the `target` DVC-file, especially vs. using that location as the `target` instead. In this case I listed them even without `--recursive`.\r\n\r\nNote that the `.dvc/` dir is omitted from the output. Also, the dates above come from the file system, same as `ls`. In the following examples, they come from git history.\r\n\r\nUsing network Git `url`s:\r\n> See full example outputs in [dvc list proposal: output examples](https://gist.github.com/jorgeorpinel/61719795628fc0fe64e04e4cc4c0ca1c) Gist.\r\n\r\n```console\r\n$ dvc list git@github.com:iterative/example-get-started.git # SSH URL\r\n 17B 2019-09-03 .gitignore\r\n...\r\n339B 2019-09-03 train.dvc\r\n5.8M └ out: model.pkl\r\n\r\n$ dvc list https://github.com/iterative/dataset-registry # HTTP URL\r\n1.9K 2019-08-27 README.md\r\n160B 2019-08-27 get-started/\r\n128B 2019-08-27 tutorial/\r\n\r\n$ dvc list --recursive https://github.com/iterative/dataset-registry tutorial # Recursive inside target dir\r\n...\r\nINFO: Expanding list recursively.\r\n\r\n 29B 2019-08-29 tutorial/nlp/.gitignore\r\n178B 2019-08-29 tutorial/nlp/Posts.xml.zip.dvc\r\n 10M └ out: tutorial/nlp/Posts.xml.zip\r\n177B 2019-08-29 tutorial/nlp/pipeline.zip.dvc\r\n4.6K └ out: tutorial/nlp/pipeline.zip\r\n...\r\n```\r\n\r\n> NOTE: Another question is whether outputs having no date is OK (just associated to the date of their DVC-files) or whether we should also get that from the default remote. Or maybe we don't need dates at all...\r\n\r\nGoing through these made me realize this command can easily get very complicated so all feedback is welcomed to try and simplify it as much as possible to a point where it still revolves the main problem (listing project outputs in order to know what's available for `dvc get` and `dvc import`), but doesn't explode in complexity.\n@jorgeorpinel this is great! can you make it as a gist or a commit - so that we can leave some comments line by line?\nOK, added to https://gist.github.com/jorgeorpinel/61719795628fc0fe64e04e4cc4c0ca1c and updated https://github.com/iterative/dvc/issues/2509#issuecomment-533685061 above.\n@jorgeorpinel I can't comment on a specific line on them. I wonder if there is a better tools for this? create a temporary PR with these files to dvc.org?\nAs a first step, we could simply print lines with all outputs. E.g.\r\n\r\n```console\r\n$ dvc list https://github.com/iterative/dvc\r\nscripts/innosetup/dvc.ico\r\nscripts/innosetup/dvc_up.bmp\r\nscripts/innosetup/dvc_left.bmp\r\n```\r\n\r\nand then move on to polishing.\nWe should plan the polishing in advance a bit so that we won't be breaking the released stuff. Defaults, available options, etc.\r\n\r\nBtw, when we just print outputs this way, wouldn't it be the same as `dvc pipeline show --outs` 🤔 \nBy default, the output should be simple and consumable by tools. It will give us an ability to chain commands like \r\n```\r\ndvc list https://github.com/iterative/dvc | grep '\\.pth$' | xargs dvc get https://github.com/iterative/dvc\r\n```\r\n(yeah, I'm pretty sure the current `dvc get` does not support this yet. EDITED: actually it does through `xargs`.)\r\n\r\nFor the same reason headers like `INFO: Expanding list recursively.` are not needed.\r\n\r\nNice looking lists with hierarchies like `└ out: tutorial/nlp/pipeline.zip` should be supported under `--human-readable` options. And this can be postpone.\n@shcheklein good point re `dvc pipeline show --outs`. But this command does not support remotes (like `dvc pipeline show https://github.com/iterative/dvc --outs`).\r\n\r\nAlso, based on my understanding,`pipeline show` does some additional stuff - sorts outputs by order in the pipeline (the last output is always the last output in the pipeline). Please correct me if it is not correct.\n> But this command does not support remotes\r\n\r\n@dmpetrov yeah, it was just a note that we kinda have a command that outputs DVC-specific info (as opposed to general ls-like output). I have no idea how can it affect any decisions in this ticket. Was sharing in case someone else has something to say about it.\r\n\r\n> the output should be simple and consumable by tools\r\n\r\nif we follow unix tools - a lot of them (probably most of them?) are not made to be scripts consumable by default. You would need to run `ls -1` to achieve a simple one item per line format:\r\n\r\n```\r\nForce output to be one entry per line. This is the default when output is not to a terminal.\r\n```\r\n\r\n`aws s3 ls` is only somewhat consumable.\r\n`find` is not consumable as far as I remember.\r\n\r\nAlso, I believe it's wider topic (similar to #2498). Ideally we should have some agreed upon approach we are taking, something like this: https://devcenter.heroku.com/articles/cli-style-guide#human-readable-output-vs-machine-readable-output And this approach should be (reasonably) consistent across all commands.\r\n\r\n> should be supported under --human-readable\r\n\r\nSee above. I don't remember actually from the top of my head any of the tools that are taking this approach. The only one common convention is `-h` but it does not change layout of the output. It changes the details.\r\n\r\n> And this can be postponed.\r\n\r\nagreed that we can postpone adding nice details (file sizes, DVC-file per output, etc). But I think it's very important to decide on the default behavior:\r\n\r\n1. **Does it show _all_ files (and you need to specify a flag to show outputs only) vs only outputs.** I've outlined the reasons I think we should be taking ls-like approach and show all files, not DVC-specific only.\r\n2. **Does it go down recursively vs you need to provide a flag -r**, similar here - `ls` or `aws ls` vs DVC-specific interface focusing on all outputs. Again, I don't see a reason to do this - everyone is familiar with `ls` or `aws s3 ls` behavior. It'll be way easier to explain and easier to alter the behavior with an option.\r\n\r\n\r\n\nTo answer these behavior and UI questions we need to return back to the original motivation:\r\n\r\n> \"browsing\" external DVC projects on Git hosting before using `dvc get` or `dvc import`. Looking at the Git repo doesn't show the artifacts because they're only referenced in DVC-files (which can be found anywhere), not tracked by Git.\r\n\r\nFirst of all, I understand this pain of not seeing data files in my Git repo.\r\nTo my mind, a list of outputs will answer the question. The list of the other Git files (like `README.rst`) seems not relevant and even introduces noise to the answer. Do we need to go recursively - hm.. probably yes, since most of the data files are hidden under `input`, `data`, `models` directories. We can avoid the need in multiple `dvc list`s. More than that, we have to go recursively (technicaly), because some DVC-file from a subfolder can generate outputs into the root of the repo.\r\n\r\nNew questions that I just got:\r\n1. Do we have any other scenarios/questions in mind or this is the only one? I have a feeling that @shcheklein has some.\r\n2. Is `dvc list` a right command name? Why not `dvc find` or `dvc whereis`? Do we need both `dvc list` (show all files) & `dvc whereis` (I don't like this idea but still)\r\n3. Should it show Git committed outputs (including metrics files)? Is it important (not nice-to-have, but important) to mention in output (by default) that a certain file is committed to Git? If so, how to show it (a programmatically consumable list of files might be not enough).\r\n\r\n\r\nSome details regarding the output formatting... Yes, in some cases it makes sense to give preference to human-readable commands. Like your Heroku example where a complex/hierarchical output was produced. \r\nBut in this case, we are talking about a list of files which is human readable already. I see no benefits of introducing additional complexity (by default). If we decide that type of the file (Git\\Remote\\metrics) is important to see by default then it can be a reason to use a more complicated format. So, I'm not against this I just see no value.\r\n\r\n> if we follow unix tools - a lot of them (probably most of them?) are not made to be scripts consumable by default.\r\n\r\nI don't agree with this.\r\n\r\n> I don't remember actually from the top of my head any of the tools that are taking this approach.\r\n\r\n`aws s3 ls --human-readable`, `du -h *`\r\n\r\n> `aws s3 ls` is only somewhat consumable.\r\n> `find` is not consumable as far as I remember.\r\n\r\n`aws s3 ls` is actually not the best example. It has quite a terrible UX.\r\n`find` output is very consumable. As well as `ls` (it does the hack internaly) and most of the unix-commands.\n> if we follow unix tools - a lot of them (probably most of them?) are not made to be scripts consumable by default\r\n\r\nEven if it is so, most of the unix tools have an option to produce scriptable output. For example `git status` and `git status --porcelain`.\nRegarding the scriptable output. `--porcelain`, `--json`, etc - is exactly an approach that I was mentioning. The point is that most of the tools are not made to be scriptable by _default_. That's exactly the point of the link I shared: \r\n\r\n\r\n>Terse, machine-readable output formats can also be useful but shouldn’t get in the way of making beautiful CLI output. When needed, commands should offer a --json and/or a --terse flag when valuable to allow users to easily parse and script the CLI.\r\n\r\nBtw, Git porcelain explains it very well why it's better to provide an option for script consumable outputs:\r\n\r\n\r\n> Give the output in an easy-to-parse format for scripts. This is similar to the short output, but will remain stable across Git versions and regardless of user configuration. See below for details.\r\n\r\n_stable_ API - It'll be way easier for to maintain and evolve the output later if we use an option.\r\n\r\nSo, `ls` is doing some magic and by default does not sacrifice human UI, `heroku, `git` have an option, `find` is somewhat consumable - but usually you should be providing `print0`, `aws` is somewhat consumable - in a Heroku's guide sense.\n> I wonder if there is a better tools for this? create a temporary PR with these files to dvc.org?\r\n\r\n@shcheklein good idea. Here's one: https://github.com/iterative/dvc/pull/2569/files\r\n\r\n> For the same reason headers like `INFO: Expanding list recursively.` are not needed...\r\n\r\nRight, `INFO/WARNING` etc logs/messages. could be included in the `-v` (verbose) output though.\r\n\r\n> agreed that we can postpone adding nice details (file sizes, DVC-file per output, etc). But I think it's very important to decide on the default behavior...\r\n\r\nWe should definitely prioritize the features of this command but I also think a good initial design can save lots of time in the future. Let's not go overkill though because once we're actually implementing I'm sure a lot of new questions will come up.\r\n\r\nAs for the default behavior, I think it should list all files (Ivan convinced me here: https://github.com/iterative/dvc/issues/2509#issuecomment-532781756) and with level 2 or 3 recursion to catch _most_ buried DVC-files, but warn when there are DVC-files in even deeper levels. It also needs a length limit like 100 files though (especially if we decide full recursion as default) – not sure how to list more if the limit is reached.\r\n\r\n> DVC-file from a subfolder can generate outputs into the root of the repo.\r\n\r\nYes... This is confusing and hard to figure out how to output this in `dvc list` if we show the relationship between DVC-files and output files so perhaps that's one of the less features with less priority.\r\n\r\n> Should it show Git committed outputs?\r\n\r\nGood Q. I think it would be important to mark on any stage output that is Git-tracked in the output of `dvc list`.\nDiscussed briefly with @dmpetrov and I think we agreed on **no recursion**, **all files** mode by default. Then, `-o` and `-r` options to filter the list as you need. @dmpetrov could you chime in, please?\nI'd prefer `ls-files` to match `git` more closely\nfyi, for `git ls-files`:\r\n\r\n- recursively all files: (no args)\r\n- current dir: `.`\r\n- recursively all python files: `'*.py'`\r\n- tracked python files in current dir: `*.py` (assumes shell expansion, git will exclude untracked file arguments)\n@casperdcl interesting point.\r\n\r\nIn what cases do you use `git ls-files` vs regular `ls`? I think they serve a bit different purposes and to me intuitively `dvc list` or `dvc ls` (name does not matter that much) serves the role of `aws s3 ls` or `ls`. There are chances that default behavior for `ls-files` is done this way to augment `ls`.\r\n\r\n`git ls-files` sounds like an advanced Git-specific command. And if we go that path, we should probably indeed do recursive list of outputs (files that are under DVC control) - but that will create some disconnect with `dvc get` and `dvc import` (that now serve the roles of wget, cp, aws s3 cp, etc) that can deal with regular files now. Also, not sure how will it work for files inside outputs (when I want to see some specific images inside a specific output).\r\n\n- if there are many files (some untracked and some in `.gitignore`) and I only want to `ls` the tracked ones\r\n- immediately understand exactly what `git archive` would include\r\n- `-x` and `-X` patterns for systems without `grep`\r\n- `-t` flag: also marks file status\n@casperdcl so the cases you are describing are indeed very different from `ls`. They are specific to Git workflow. In case of this new command, my feeling that it's better to compare it with `ls` or even `aws s3 ls` since we kind-a take the ability to access buckets directly away.\nI'd argue that `dvc ls-files` listing only dvc-tracked files would be very valuable. I don't see much value in implementing something simpler which is a minor modification to `ls` \nso, that's the point the is no `ls` for us and a regular one does not work. It's exactly the same reason why `aws s3 ls` exists. Regular `ls` won't work for a remote Git repo, right? May be that's where some misunderstanding comes from. The idea is that it should enable some discoverability for DVC projects and you supposed to use it like:\r\n\r\n```\r\ndvc list https://github.com/iterative/example-get-started \r\n```\r\n\r\nand then:\r\n\r\n```\r\ndvc get https://github.com/iterative/example-get-started README.md\r\n```\r\n\r\nor \r\n\r\n```\r\ndvc list https://github.com/iterative/example-get-started data\r\ndvc import https://github.com/iterative/example-get-started data/data.xml\r\n```\r\n\nAh right. Remote listing pre-download is different.\n\nI was talking about local listing local files.\n\nI guess they'll have different implementations but would be nice to have them both called the same command (I'd prefer `ls-files`, but fine with `ls` or `list` too).\nI think `dvc list .` will work fine in this case. It'll show all files tracked by Git + expansion of DVC-files to show outputs. So it is DVC specific ls-file in this sense. I would still prefer to have default like in `ls` - no recursion, show all files - Git-tracked + DVC outs.\r\n\r\n`dvc list .` is an edge-case for this command. The main usage is the remote one and I would really like to see just a list of files the same way I do with `ls`. (+some options to refine and filter if needed).\nI'm going to work on the issue":1,"I'll pick this up and submit a PR soon.":1,"I saw this the other day on typed dicts, which python versions support this?\r\n\r\nI'm keen if the implementation isn't too complicated.\nIt's supported in 3.6+ for sure. \n\nGreat, I'll make a PR soon then!\n\nBTW, was this issue closed by accident?":1,"Thanks for reporting, if there's an easy fix, happy to accept a PR for 1.10.3.\r\n\r\nOtherwise, let's make sure we get this right in v2. Tbh, there are lots of types that currently break JsonSchema. ":1,"The error message should say to install `dvc[webdav]` and not `dvc[webdavs]`, but either way it should also be installed automatically with `[all]`.\r\n\r\nIs this a DVC installation that you've upgraded from earlier versions via pip? webdav support was added (relatively) recently, so it's possible that if you upgraded via pip it was not installed.\r\n\r\nRunning\r\n```\r\npip install --upgrade dvc\r\n```\r\nwill only upgrade core DVC, and not any of the remote dependencies.\r\n\r\nTo upgrade DVC and its remote dependencies, you need to run\r\n```\r\npip install --upgrade dvc[all]\r\n```\r\n(or substitute the specific remotes you wish to upgrade instead of `all`).\nYes, I upgraded from 1.10.1 via pip. But I had not installed any remote bevore and run\r\n```\r\npip3 install dvc[all]\r\n```\r\nwhich installed all remotes successfully. \r\n\r\nHence, from your answer, I assume that the trailing s in _webdavs_ was the only problem?\nYes, the issue was just the trailing s. Internally, the URL scheme for webdav over SSL/TLS is `webdavs`, but the extra to be installed is `[webdav]` (which covers both `webdav` and `webdavs` remote URL schemes). However, when we generate the error message for a missing remote dependency we incorrectly substitute the URL scheme rather than the proper pip extras name.\r\n\r\nThis bug would also apply to `http` remotes, for HTTPS URL's the error message will suggest installing `dvc[https]` when it should be `dvc[http]`.":1,"hi, @anjapago , could you try to see if this quick and dirty workaround helps:\r\n\r\npip install git+https://github.com/shcheklein/dvc@workaround-3473\r\n\r\n(use it this way `dvc get --rev=feb20gem https://github.com/iterative/blog yarn.lock` - always specify `--rev`)\nMore context from the discussion. Full clone takes ~20min which makes commands like `dvc get`, `dvc list`, `dvc import` as well as `dvc.api` effectively unusable.\nRight. Ping myself :)":1,"Not sure about this, as not mtime on data files nor mtime on cache files is really indicative of the usage or lack of it. Plus, I don't see a good way that we will not break a particular pipeline with older files. Need to reconsider it later. Moving to 0.9.8 milestone.\nMore organic way would be to use git commits as a limiter. I.e. gc --time month will save data for all pipelines up to a week.\nMoved to 0.11.0. \nA user mentioned this idea on Discord today.\nBTW, another \"natural way to reduce size\" could be **by size** e.g. `dvc gc --size-over 1G` - removes all cached files larger than a GB.\nBTW, this (`--time` feature) can be done currently via Git. It may be a little complicated e.g. requiring rewriting the repo history but we could write a guide or how-to about it instead of implementing the feature. If so we could move this issue over to dvc.org.\r\n\r\nAnd the `--size` feature is doable via regular GNU tools like `du ... | xargs rm ...` etc. which we could also document.\nWe had another user request this feature today, in the context of shared caches ([see chat](https://discord.com/channels/485586884165107732/563406153334128681/861989689891880971)).\n@jorgeorpinel I would also be interested in this feature. Could you elaborate on how the `--time` feature could be achieved with git?\n@lassepe sure, by deleting all the commits before that date (see [this Q](https://stackoverflow.com/questions/29042783)) and then using `dvc gc -A`.\nAh okay, this seems like a bit too aggressive then because I still need to keep the code history. I'll wait for the actual feature then.\nYou could do it in a temporary repo clone and then discard it (don't rewrite the upstream or your main working repo).\nAny updates? this feature would be very important to me.. I currently have some models that are retrained weekly, and I was using dvc to version the models and datasets, but the bucket size was getting too big and I don't need the old models (I need keep only the last 3 or 4 models in case rollback is needed).\r\nas currently this feature is not available it is an impediment for me to use dvc.\n> Any updates? this feature would be very important to me.. I currently have some models that are retrained weekly, and I was using dvc to version the models and datasets, but the bucket size was getting too big and I don't need the old models (I need keep only the last 3 or 4 models in case rollback is needed).\r\nas currently this feature is not available it is an impediment for me to use dvc.\r\n\r\n@rafaelsdellama Do you need the `datetime` feature specifically or would some alternative approach like `gc -n ` (https://github.com/iterative/dvc/issues/7695) work for your use case?\r\n\r\n":1,"It's happening to other users as well (discussion with Benjamin on Discord). Symptoms are very similar - zsh (a regular one), PATH is modified. Not `conda`, virtualenv is being used. OS - Mac.\n@shcheklein in their case, is DVC installed in the \"parent\" Python environment, or in a separate virtualenv? The problem might lie in something that has to do with the parent/child relationship.\r\n\r\nAlso, did they use Homebrew to install Python? Brew is another common factor here, and more likely to cause problems than Zsh, since Brew does its own layer of symlinking.\r\n\r\nMy admittedly convoluted setup:\r\n```\r\nLinuxbrew\r\n├─ Pyenv\r\n│ └─ Conda <- PATH is broken when DVC is installed here\r\n│ └─ Active conda environment <- PATH is OK when DVC is installed here\r\n└─ Python\r\n └─ Pipx-managed Virtualenv <- PATH is OK when DVC is installed here\r\n```\n@gwerbin Thanks! I've asked Benjamin to take a look and share more details. \r\n\n> @shcheklein in their case, is DVC installed in the \"parent\" Python environment, or in a separate virtualenv? The problem might lie in something that has to do with the parent/child relationship.\r\n\r\nI have tried two setups, and both fail the sense that:\r\n\r\n1. The error `ImportError: No module named pandas` is returned.\r\n2. `dvc run -o test 'which python > test'` outputs `/usr/local/bin/python` in the `test` file, where it should point to `python` in the virtualenv.\r\n\r\nSetup 1\r\n> ```\r\n> Homebrew\r\n> └─ DVC (`/usr/local/bin/dvc`)\r\n> └─ Virtualenv + Python (`/usr/local/bin/{python,virtualenv}`)\r\n> └─Active virtualenv environment\r\n> └─ Pandas\r\n> ```\r\n\r\nSetup 2\r\n> ```\r\n> Homebrew\r\n> └─ Virtualenv + Python (`/usr/local/bin/{python,virtualenv}`)\r\n> └─Active virtualenv environment\r\n> └─ DVC\r\n> └─ Pandas\r\n> ```\r\n\r\n> Also, did they use Homebrew to install Python? Brew is another common factor here, and more likely to cause problems than Zsh, since Brew does its own layer of symlinking.\r\n\r\nYes, Python was installed by Homebrew. (FYI: the Python interpreter that comes with the latest version of macOS (Mojave, version 10.14.6) is 2.7.10 and is 4.5 years old. I figure most people using Python on macOS will have shadowed this outdated version with a more recent one.)\r\n\r\n@shcheklein and @efiop asked me to share the output of a few commands on the Discord channels and perhaps it helps if I share it here as well.\r\n\r\n```\r\n> echo $SHELL\r\n> dvc run -f test.dvc 'echo $SHELL'\r\n> ls -la $SHELL\r\n> file $SHELL\r\n/bin/zsh\r\n'test.dvc' already exists. Do you wish to run the command and overwrite it? [y/n] y\r\nRunning command:\r\n echo $SHELL\r\n/bin/zsh\r\nSaving information to 'test.dvc'.\r\n\r\nTo track the changes with git, run:\r\n\r\n git add test.dvc\r\n-rwxr-xr-x 1 root wheel 610240 May 4 09:05 /bin/zsh\r\n/bin/zsh: Mach-O 64-bit executable x86_64\r\n> cat test.dvc\r\ncmd: echo $SHELL\r\nmd5: ee3b44e50705d557b7aa3eef74821f74\r\n```\r\n\r\nI wish I could help out more, but my knowledge of Python environments and DVC internals is very limited. However, let me know if I can help you out with further information and I'm happy to provide it.\nFor the record: I am able to reproduce https://github.com/iterative/dvc/issues/2506#issue-494639954 even on the linux machine.\r\n\r\nIn my case `which dvc` shows pyenv shim, which has something like:\r\n```\r\nexec \"/home/efiop/.pyenv/libexec/pyenv\" exec \"$program\" \"$@\"\r\n```\r\nin it, which is the thing that adds some stuff on top of the base env, as we can see:\r\n```\r\n➜ dvc-test git:(755) ✗ /home/efiop/.pyenv/libexec/pyenv exec --help\r\nUsage: pyenv exec [arg1 arg2...]\r\n\r\nRuns an executable by first preparing PATH so that the selected Python\r\nversion's `bin' directory is at the front.\r\n\r\nFor example, if the currently selected Python version is 2.7.6:\r\n pyenv exec pip install -rrequirements.txt\r\n\r\nis equivalent to:\r\n PATH=\"$PYENV_ROOT/versions/2.7.6/bin:$PATH\" pip install -rrequirements.txt\r\n```\r\n\r\nIt would be nice of pyenv would've left something like `PATH_ORIG` env var, so that we could use it later. This would be similar to how pyinstaller leaves VAR_ORIG if it changes it, e.g. LD_LIBRARY_PATH. Looking for possible and viable automatic workarounds. Might have to suggest this to pyenv later though, to make it straightforward for everyone.\nInteresting detail: our good friend @AlJohri has run into it before even using dvc: https://github.com/pyenv/pyenv/issues/985 🙂 ":1,"Hi @sremm !\r\n\r\nIndeed, looks like state backward compatibility issue 🙁 , probably caused by some locking adjustments we've done. The only solution for you right now is to install the newest version and delete `.dvc/state` , after that everything should start working. You will, however, lose all the cached hashes that are in that state db, but that will be recomputed once when you next use some particular file, so shouldn't be a big issue, even though inconvenient. Would that work for you? \nI couldn't reproduce it @sremm, @efiop :disappointed: \r\n\r\n```bash\r\npip install dvc==0.59.2\r\ndvc init --no-scm\r\ndvc run -o foo \"echo foo > foo\"\r\npip uninstall dvc && pip install dvc\r\nrm foo\r\ndvc checkout\r\ndvc run -o bar \"echo bar > bar\"\r\n```\r\n\r\nMaybe your state file got corrupted somehow.\r\n\r\nHow did you perform the update?\nGood catch @mroutis !\r\n\r\n@sremm Btw, could you please show `dvc version` output on both dvc versions? It contains some additional info, which might help us better understand what happened. \r\n\r\nWe have this new piece of code in https://github.com/iterative/dvc/blob/0.71.0/dvc/state.py#L491 , where we try to connect by the uri, if we can. Might be that we didn't quite get the sqlite requirements right. In which case, we should be able to recover from this issue without losing the state db.\r\n\r\nAlso, `python -c 'import sqlite3; print(str(sqlite3.sqlite_version_info))'` would be helpful as well :)\n@mroutis I used `pip install dvc --upgrade` doing `pip uninstall dvc && pip install dvc` like in your example did not change the behaviour\r\n\r\n@efiop I tried updating dvc and then removing `.dvc/state` but still experience the same behaviour.\r\n\r\nHere are the outputs:\r\nFor the working version\r\n```\r\ndvc version\r\n/home/mlburk/anaconda3/envs/tf-gpu/lib/python3.7/site-packages/git/repo/base.py:129: UserWarning: The use of environment variables in paths is deprecated\r\nfor security reasons and may be removed in the future!!\r\n warnings.warn(\"The use of environment variables in paths is deprecated\" +\r\nDVC version: 0.59.2\r\nPython version: 3.7.4\r\nPlatform: Linux-4.15.0-70-generic-x86_64-with-debian-buster-sid\r\nBinary: False\r\nCache: reflink - False, hardlink - False, symlink - True\r\nFilesystem type (cache directory): ('fuseblk', '/dev/sda2')\r\nFilesystem type (workspace): ('ext4', '/dev/sdb2')\r\n```\r\nand for the latest version\r\n```\r\ndvc version\r\n/home/mlburk/anaconda3/envs/tf-gpu/lib/python3.7/site-packages/git/repo/base.py:129: UserWarning: The use of environment variables in paths is deprecated\r\nfor security reasons and may be removed in the future!!\r\n warnings.warn(\"The use of environment variables in paths is deprecated\" +\r\nDVC version: 0.71.0\r\nPython version: 3.7.4\r\nPlatform: Linux-4.15.0-70-generic-x86_64-with-debian-buster-sid\r\nBinary: False\r\nPackage: pip\r\nCache: reflink - False, hardlink - False, symlink - True\r\nFilesystem type (cache directory): ('fuseblk', '/dev/sda2')\r\nFilesystem type (workspace): ('ext4', '/dev/sdb2')\r\n```\r\nOutput of `python -c 'import sqlite3; print(str(sqlite3.sqlite_version_info))'`\r\n(3, 29, 0)\r\n\r\nPerhaps there some other small example I could also try to reproduce?\n@sremm You've removed .dvc/state _after_ upgrading, right?\nDouble checked and yes, upgraded -> removed .dvc/state -> try to add a simple file\r\n\r\nsame behaviour.\r\n\r\nSince I also use a windows machine with the same repository, I thought I'd try to upgrade there as well. \r\n\r\nDVC version: 0.71.0\r\nPython version: 3.7.3\r\nPlatform: Windows-10-10.0.16299-SP0\r\nBinary: False\r\nPackage: pip\r\nCache: reflink - False, hardlink - True, symlink - False\r\nFilesystem type (cache directory): ('NTFS', 'F:\\\\')\r\nFilesystem type (workspace): ('NTFS', 'F:\\\\')\r\n\r\nfirst I upgraded (had a little older version than 0.59.2, but everything still worked with 0.59.2)\r\nthen tried to add a small text file and got a different error\r\n```\r\ndvc add test.txt -v\r\nc:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\git\\repo\\base.py:129: UserWarning: The use of environment variables in paths is deprecated\r\nfor security reasons and may be removed in the future!!\r\n warnings.warn(\"The use of environment variables in paths is deprecated\" +\r\nDEBUG: Trying to spawn '['c:\\\\users\\\\srg\\\\appdata\\\\local\\\\continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\python.exe', 'C:\\\\Users\\\\srg\\\\AppData\\\\Local\\\\Continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\Scripts\\\\dvc', 'daemon', '-q', 'updater']'\r\nDEBUG: Spawned '['c:\\\\users\\\\srg\\\\appdata\\\\local\\\\continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\python.exe', 'C:\\\\Users\\\\srg\\\\AppData\\\\Local\\\\Continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\Scripts\\\\dvc', 'daemon', '-q', 'updater']'\r\nERROR: unexpected error - [WinError 123] The filename, directory name, or volume label syntax is incorrect: ' 16232\\n'\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\main.py\", line 49, in main\r\n ret = cmd.run()\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\command\\add.py\", line 25, in run\r\n fname=self.args.file,\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\repo\\__init__.py\", line 35, in wrapper\r\n with repo.lock, repo.state:\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\flufl\\lock\\_lockfile.py\", line 334, in __enter__\r\n self.lock()\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\lock.py\", line 78, in lock\r\n super(Lock, self).lock(timedelta(seconds=DEFAULT_TIMEOUT))\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\flufl\\lock\\_lockfile.py\", line 267, in lock\r\n self._break()\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\flufl\\lock\\_lockfile.py\", line 527, in _break\r\n os.unlink(winner)\r\nOSError: [WinError 123] The filename, directory name, or volume label syntax is incorrect: ' 16232\\n'\r\n------------------------------------------------------------\r\n```\r\n\r\n\r\nBut after removing the .dvc\\state I got the same error as on Ubuntu\r\n\r\n```\r\ndvc add test.txt -v\r\nc:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\git\\repo\\base.py:129: UserWarning: The use of environment variables in paths is deprecated\r\nfor security reasons and may be removed in the future!!\r\n warnings.warn(\"The use of environment variables in paths is deprecated\" +\r\nDEBUG: Trying to spawn '['c:\\\\users\\\\srg\\\\appdata\\\\local\\\\continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\python.exe', 'C:\\\\Users\\\\srg\\\\AppData\\\\Local\\\\Continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\Scripts\\\\dvc', 'daemon', '-q', 'updater']'\r\nDEBUG: Spawned '['c:\\\\users\\\\srg\\\\appdata\\\\local\\\\continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\python.exe', 'C:\\\\Users\\\\srg\\\\AppData\\\\Local\\\\Continuum\\\\anaconda3\\\\envs\\\\tf-gpu\\\\Scripts\\\\dvc', 'daemon', '-q', 'updater']'\r\nERROR: unexpected error - unable to open database file\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\main.py\", line 49, in main\r\n ret = cmd.run()\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\command\\add.py\", line 25, in run\r\n fname=self.args.file,\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\repo\\__init__.py\", line 35, in wrapper\r\n with repo.lock, repo.state:\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\state.py\", line 136, in __enter__\r\n self.load()\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\state.py\", line 228, in load\r\n self.database = _connect_sqlite(self.state_file, {\"nolock\": 1})\r\n File \"c:\\users\\srg\\appdata\\local\\continuum\\anaconda3\\envs\\tf-gpu\\lib\\site-packages\\dvc\\state.py\", line 495, in _connect_sqlite\r\n return sqlite3.connect(uri, uri=True)\r\nsqlite3.OperationalError: unable to open database file\r\n------------------------------------------------------------\r\n```\r\n\r\nRolling back to \r\n```\r\nDVC version: 0.59.2\r\nPython version: 3.7.3\r\nPlatform: Windows-10-10.0.16299-SP0\r\nBinary: False\r\nCache: reflink - False, hardlink - True, symlink - False\r\nFilesystem type (cache directory): ('NTFS', 'F:\\\\')\r\nFilesystem type (workspace): ('NTFS', 'F:\\\\')\r\n```\r\nAnd I can add the file without issues\n@sremm Oh, that is very interesting. I suspect problems in our by-url sqlite connection. Let's try to narrow it down. Please install the latest dvc and run this script in the root of your repo:\r\n```\r\nimport sqlite3\r\nfrom dvc.state import _build_sqlite_uri\r\n\r\nuri = _build_sqlite_uri(os.path.join(os.getcwd(), \".dvc\", \"state\"), {\"nolock\": 1})\r\nprint(uri)\r\nsqlite3.connect(uri, uri=True)\r\n```\r\n\r\nCC @Suor , maybe you can see better where uri might've broken 🙂 \nAlrighty, here are the results, it does result in the same error.\r\n\r\ntest_for_dvc_bug.py\r\n```\r\nimport sqlite3\r\nimport os\r\nfrom dvc.state import _build_sqlite_uri\r\n\r\nuri = _build_sqlite_uri(os.path.join(os.getcwd(), \".dvc\", \"state\"), {\"nolock\": 1})\r\nprint(uri)\r\nsqlite3.connect(uri, uri=True)\r\n```\r\nupdated to latest dvc, removed .dvc\\state again and ran the above script\r\nthis is the output\r\n```\r\nfile:///F:/repo_base/.dvc/state?nolock=1\r\nTraceback (most recent call last):\r\n File \"test_for_dvc_bug.py\", line 7, in \r\n sqlite3.connect(uri, uri=True)\r\nsqlite3.OperationalError: unable to open database file\r\n```\r\nThe above is from running on windows, but it was the same error on Ubuntu.\n@sremm Would be great to see output on ubuntu too, since we are more *nix guys than windows, so it is easier for us to grasp posix paths 🙂 But so far uri looks alright.\n@sremm And how about:\r\n```\r\nimport sqlite3\r\nimport os\r\n\r\nsqlite3.connect(os.path.join(os.getcwd(), \".dvc\", \"state\"))\r\n```\r\n? Just a sanity check to make sure that this is the uri that is broken.\n@efiop \r\nSo :) the prevous output from Ubuntu\r\n\r\nNote that in my previous comment I also had to change the actual repository name, I realised that special characters might also have an effect and that there is the \"%20\" in the folder name as seen below, everything else is just letters. (same name on widows for the actualy repository folder)\r\n```\r\npython test_for_dvc_bug.py \r\nfile:///home/mlburk/Repositories/Repo%20Base/.dvc/state?nolock=1\r\nTraceback (most recent call last):\r\n File \"test_for_dvc_bug.py\", line 7, in \r\n sqlite3.connect(uri, uri=True)\r\nsqlite3.OperationalError: unable to open database file\r\n```\r\n\r\nand the new test `test_for_dvc_bug_2.py`\r\n```\r\nimport sqlite3\r\nimport os\r\n\r\nsqlite3.connect(os.path.join(os.getcwd(), \".dvc\", \"state\"))\r\n```\r\nSo this runs without errors. I guess this is what you expected since the \"_build_sqlite_uri\" function is under suspect. The \"%20\" in the name does not seem to be an issue for the sqlite3.connect() call though.\r\n\r\n\n@sremm Thanks! Interestingly enough, I can reproduce if I feed a relative path to the _build_uri. How about this piece of code on Ubuntu:\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:/home/mlburk/Repositories/Repo%20Base/.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n```\r\nI suppose that `/home/mlburk/Repositories/Repo%20Base/.dvc/state` is a valid one for your machine, right? If so, please run the code above and show the output. I suspect that it might be \"//\" situation that is at fault.\r\n\n@efiop \r\ntest_for_dvc_bug_3.py contents\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:/home/mlburk/Repositories/Repo%20Base/.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n\r\n```\r\nOutput\r\n```\r\npython test_for_dvc_bug_3.py \r\nTraceback (most recent call last):\r\n File \"test_for_dvc_bug_3.py\", line 4, in \r\n sqlite3.connect(uri, uri=True)\r\nsqlite3.OperationalError: unable to open database file\r\n```\r\n\r\nAnd yes with `uri = \"/home/mlburk/Repositories/Repo%20Base/.dvc/state?nolock=1\"`, there is no error, so without \"file:\" otherwise the same.\r\n\r\nAlso tried with `uri = = \"///home/mlburk/Repositories/Repo%20Base/.dvc/state?nolock=1\"` no error, empty output.\n@sremm Without `file:` it most likely creates `state?nolock=1` file instead of `state`. And probably created `Repo%20Base` directory, though I'm not sure about this one. Pretty weird stuff. Let's try this one too:\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n```\r\nIs there anything special about your python or your setup in general? \n> The \"%20\" in the name does not seem to be an issue for the sqlite3.connect() call though.\r\n\r\nBtw, how did you test that? I suppose you have a directory `Repo Base` with the space in the name, right?\n@efiop with the code contents as the below snipped, there is no error and a state file is created\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n```\r\nHmm, the folder itself has the \"%20\" in the name, the repository in our internal server has a space though, but after forking with git it sets the \"%20\" to the actual folder name instead of the space.\r\nAnd I do suspect that there is something to do with the \"%20\" since i tried renaming the folder to have an actualy space instead of \"%20\" and the issue dissapears. I can add files with the latest dvc version.\r\n\r\nHere are some more cases where I get the error to help debug.\r\nTried to run with `uri = \"file:/home/mlburk/TestFolder/Base%20Repo/.dvc/state?nolock=1\"` where the \"TestFolder\" does not exist and get the same old error.\r\nAlso tired with `uri = \"file:/home/mlburk/Repositories/NewFolder/.dvc/state?nolock=1\"` where NewFolder exists, but \".dvc\" folder does not.\r\nSo when some folders are missing `sqlite3.OperationalError: unable to open database file` seems to pop up as well.\r\n\r\nI also tested creating a new folder with path `/home/mlburk/Repositories/Test%20Folder/.dvc` (no space the actual \"%20\" in the name) manually and tried running the code below, which also gave the error.\r\n\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:/home/mlburk/Repositories/Test%20Folder/.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n```\n> Hmm, the folder itself has the \"%20\" in the name\r\n\r\nAh, ok, now it all makes sense! The uri should be encoded, and `%20` means empty space, so sqlite tries to open \"Repo Base\" instead of \"Repo%20Base\", since it decodes it. So our uri builder should escape that properly. So most likely we need to \r\n```\r\nimport urllib.parse\r\nfilename = urllib.parse.quote_plus(filename)\r\n```\r\nin https://github.com/iterative/dvc/blob/master/dvc/state.py#L499 . Are you familiar with modifying our project and installing the dev version? If you are, could you do those modifications and give it a try? E.g.\r\n```\r\ngit clone https://github.com/iterative/dvc\r\ncd dvc\r\n# modify dvc/state.py\r\npip install .\r\n```\n@sremm To make sure that my conclusions are correct, could you try running:\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:///home/mlburk/Repositories/Repo%2520Base/.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n```\r\n\r\nNotice that \"Repo%20Base\" got encoded into \"Repo%2520Base\"\nRunning the snipped below\r\n```\r\nimport sqlite3\r\n\r\nuri = \"file:///home/mlburk/Repositories/Repo%2520Base/.dvc/state?nolock=1\"\r\nsqlite3.connect(uri, uri=True)\r\n```\r\nresults in no errors and the state file is created in `/home/mlburk/Repositories/Repo%20Base/.dvc/`\n@sremm Great news! So we've found the issue. Patch is coming soon, stay tuned! 🙂 Thanks for the feedback!":1,"Yeah this seems like a good feature request to me.\r\n\r\nI've never tried nesting BaseSettings classes but it seems totally reasonable to me and I don't see any reason it shouldn't work like this. (But maybe @samuelcolvin does?)\r\n\r\nCould you produce a failing test case or two as a starting point for implementation work?\nSounds good to me. \r\n\r\nDo you want to use dot notation e.g. `db.host`?\r\n\r\nAlso should this work for dictionaries too?\r\n\r\nThis isn't required for v1 since it would be entirely backwards compatible. \nIt's great to hear!\r\n\r\nI think the only logic that needs to change is merging of `self._build_environ()` and `init_kwargs` dictionaries, so I don't see why it wouldn't work for dictionaries.\r\n\r\nShould I start a merge request with the changes and tests or would you like to tackle this one yourselves?\n@idmitrievsky It would be great if you could start a pull request for this. Your approach to the logic sounds right to me (though admittedly there could be some edge cases I'm not considering).":1,"Guys, so maybe `--no-header` after all? Or do you see a different usecase for `--no-header` that will force us to create `--no-table-header` in the future to differentiate the use cases? @pared \n+1 for `--no-header`, at least `--no-csv-header` feels wrong since it's not CSV only\nHi, Can I work on this issue?\nI don't see a future use case for `--no-header` as of today, let's do it. I guess if there would be more important and viable use case for that option, we would know by now.":1,"Thanks for reporting.\r\n\r\nHappy to accept a PR to add a proper `__eq__` method to `NameEmail`":1,"The error, in this case, can be avoided. Do you think it would be more useful to return an empty dict or rather raise an exception like `No params found`?\nI think an error in this case? I doubt there's much reason to call `params_show` if you expect an empty dict.\r\n\r\nWhat would happen if there was a `params.yaml` but no `dvc.yaml` found? What about the inverse?\n> I think an error in this case? I doubt there's much reason to call params_show if you expect an empty dict.\r\n\r\nI was thinking about returning an empty dict instead of raising an exception because `dvc {X} show` commands don't fail when there is nothing to return.\r\n\r\n> What would happen if there was a params.yaml but no dvc.yaml found? \r\n\r\nThe contents of `params.yaml` will be returned.\r\n\r\n> What about the inverse?\r\n\r\nThe `KeyError` point will be reached.\r\n\r\n":1,"@piojanu I guess what we should do is check whether or not the data is already ignored by git and if it is then just not add it to yet another gitignore. Does that make sense for your scenario?\nHmm. You would have to check if e.g. whole directory, that the file is in, isn't ignored already. Then it would do fine.\n@piojanu Sure. There is actually a `git check-ignore` command, which we could utilize, unless there is a more straightforward way in GitPython.\n@piojanu Ok, there is actually a `repo.git.check_ignore()` supported already. So basically all we'll have to do is to add a check for it to `Git.ignore()` in https://github.com/iterative/dvc/blob/master/dvc/scm/git.py#L76 . Would you like to submit a PR for it? :slightly_smiling_face: \nI'd love too, but for now I have very little time to sit down to it.\n@piojanu No worries :) We'll try to get to it when we have time then. Thanks for the feedback! :slightly_smiling_face: \nHey @efiop and @piojanu. I can work on this after work tonight. Do you mind if I take this issue?\nHi @J0 ! Sure! Thanks a lot for looking into it! Let us know if you need any help and/or have any questions. :slightly_smiling_face: \nAnyone working on it ? or I can pick this up with some help \n@veera83372 Not sure if @J0 is still working on this. Let's see if he replies. \n@efiop I am still working on this issue. Sorry for the long delay — just opened a PR\nIs this still being worked on?\n@J0 Are you still working on this?\n@Aljo-Rovco I doubt. The PR (empty?) was closed a while ago. Feel free to pick it up and contribute and let us know if you'd need any help from us.\n@shcheklein was planning to give 1 day for @J0 to reply and then give this a go, but ok :)\n@Aljo-Rovco Looks like @J0 is not responding, so indeed, please feel free to take this one. Thanks a lot for looking into it! 🙂 \n@Aljo-Rovco Are you working on this?\nHey sorry, was swamped. Not sure how well I'm suited to contribute, but I can try. Would it just be a check here: https://github.com/iterative/dvc/blob/master/dvc/scm/git/__init__.py#L137 ?\n@Aljo-Rovco No worries. That would be the place to check, yes :slightly_smiling_face: ":1,"Ok, so discussed with @pmrowla and @pared that it makes sense to forbid it. If someone asks for this in the future, we could introduce `--subrepos` or smth like that for push/pull/etc.\nThe reason it does't throw an error right now is https://github.com/iterative/dvc/blob/1.0.0a1/dvc/repo/__init__.py#L210 . It opens dvcfile directly without consulting with the clean tree.\r\n\r\nAs discovered by @skshetry , repo.tree doesn't use dvcignore when checking if something exists (only uses it when walk()ing). So we need to revisit CleanTree to fix that.":1,"I don't understand the autocompletion issue with the `-c \"echo bar > bar\"` format. I'm able to autocomplete on Ubuntu in bash and zsh even inside of quotes. Is there an example of how this breaks autocompletion? Is it a specific issue with OSX? Maybe @dmpetrov can elaborate?\n@dberenbaum, that's strange. For me (on Linux), it never autocompletes, with or without DVC's autocompletion.\n@skshetry What are you trying to autocomplete? What shell are you using? Does autocomplete work for you without the `-c` flag and quotes?\n@dberenbaum Autocompletion issue - the default autocomplete suggests files that I have in a dir when I type `dvc run -n s1 python tr` (suggests `train.py`). It won't suggest inside a quoted string - `dvc run s1 -c \" python tr` (however, it suggests as 1st item in a string `dvc run s1 -c \"tr` which is not a usual corner case).\r\n\r\n@skshetry The decision about string VS reminder was made in the very first version of DVC. I considered a `-c/--command` option as the opposite of the remainder. The reminder looks more common and convenient. An analogy with a reminder - `xargs`.\r\n\r\nTo my mind, the issue with mixing up params is not a major one. By replacing the behavior we might have new issues (the autocomplete is one of them). I suggest not changing the behavior and keep cmd as a reminder.\nThanks, @dmpetrov! I was trying the equivalent of `dvc run s1 -c \"tr`, but now I understand and see the same on my end.\nI agree that `But, we have heard complaints from users that it's confusing, as trying to add certain flags to dvc run at the end is now assumed to be part of the user's script.` doesn't sound like a big issue, considering that people will have to double quote commands now (and escaping if needed) + they will have to remember/learn about `-c` + it breaks autocompletion (not matter DVC's one installed or not).\nYup, let's stick with the existing syntax (positional arguments) unless you have any concerns @skshetry .":1,"Thanks @mattseddon! Could you describe how it impacts VS Code and how important it is?\r\n\r\nI see that it's inconsistent with other commands, but both behaviors seem initially reasonable to me, and since I have never seen a user complaint about it, I would only prioritize it based on your needs.\nThis broke the workflow of getting setup with a new project/repository. That is something that we want to cover with the extension so it is fairly important to us. \r\n\r\nHere are a couple of thoughts that I've had:\r\n\r\n1. If the error is expected (which I think is reasonable) then we should not get an \"unexpected error\"\r\n2. If we have to have a commit for some commands to work then maybe `dvc init` should generate that commit.":1,"Yep it's a bug. Since for python `Union[int, float] == Union[float, int]`, the key in the cache is the same.\r\nI guess we could use `(cls, params, get_args(params))` as key of `_generic_types_cache` instead of `(cls, params)`\n> Yep it's a bug. Since for python `Union[int, float] == Union[float, int]`, the key in the cache is the same.\r\n\r\nGood to hear!\r\n\r\n> I guess we could use `(cls, params, get_args(params))` as key of `_generic_types_cache` instead of `(cls, params)`\r\n\r\nWhat about nested models, say `List[Union[float, int]]` and `List[Union[int, float]]`? Wouldn’t these still be considered equal? \nIs this new in v1.10?\n> Is this new in v1.10?\r\n\r\nNo, saw it first in 1.9.0 and then updated to check if it was still there in the newest version. It is probably as old as the current specification of the key in `_generic_types_cache`.\nHumm, can't remember if that was new in 1.9 or 1.8.\r\n\r\nThe question is whether we should fix this in a patch release of 1.10 or wait for V2?\n> The question is whether we should fix this in a patch release of 1.10 or wait for V2?\r\n\r\nThat’s obviously not for me to say, but personally I think it would have been nice with a patch of at least the basic (non-nested) case, as the bug is breaking several of my tests.\nThis gets more complicated, as the more-or-less exact same issue is present in the `typing` library itself, e.g.\r\n\r\n```python\r\nfrom typing import get_args, List, Union\r\n\r\nprint(get_args(Union[int, float]))\r\nprint(get_args(Union[float, int]))\r\nprint(get_args(List[Union[float, int]]))\r\nprint(get_args(List[Union[int, float]]))\r\n```\r\n\r\nPrints:\r\n\r\n```\r\n(, )\r\n(, )\r\n(typing.Union[float, int],)\r\n(typing.Union[float, int],)\r\n```\r\n\r\nThis is discussed in [this CPython issue](https://github.com/python/cpython/issues/86483), which include comments by Guido, and which resulted in the following documentation change:\r\n\r\n> If X is a union or [Literal](https://docs.python.org/3/library/typing.html#typing.Literal) contained in another generic type, the order of (Y, Z, ...) may be different from the order of the original arguments [Y, Z, ...] due to type caching.\r\n\r\n(from the [current Python docs](https://docs.python.org/3/library/typing.html#typing.get_args))\r\n\r\nThis at least rules out a recursive solution using `get_args` for nested models (which I was toying around with). If I understand this correctly, I believe it also means that the difference between e.g. `List[Union[float, int]]` and `List[Union[int, float]]` would be inaccessible in Python itself, which is a problem.\r\n\r\nThinking from the perspective of a downstream library depending on `pydantic` I suppose one could implement a workaround for the nested problem(i.e. `List[Union[int, float]] == List[Union[float, int]]`) by replacing `Union` with a custom model, say `OrderedUnion`, which overrides `__eq__`. Such a model could even be included in `pydantic` if there is great enough need for this.\r\n\r\nHowever, all of this does not disqualify the simple `get_args` fix suggested by @PrettyWood. It would still work for the top level `Union` case, as in my example code, which is really the only thing I need for my code anyway. Also, I suppose the fact that a solution to the nested problem would be dependent on the above-mentioned \"feature\" in Python is really an argument for only solving the simple non-nested issue now. So, in a sense, I would argue that this complication might actually make this issue simpler to manage, at least for now.\nConfirmed, I think we should fix this in V1.10.\r\n\r\nPR welcome, it'll need to be pretty quick to make it into the next patch release #4472, but otherwise it can be included in the (inevitable) next patch release.\nI can give it a try.\ngreat, thanks.\nI'm getting the following mypy errors:\r\n```\r\npydantic/generics.py:65: error: Argument 1 to \"get_args\" has incompatible type \"Union[Type[Any], Tuple[Type[Any], ...]]\"; expected \"Type[Any]\" [arg-type]\r\npydantic/generics.py:131: error: Argument 1 to \"get_args\" has incompatible type \"Tuple[Type[Any], ...]\"; expected \"Type[Any]\" [arg-type]\r\n```\r\n\r\nWhich seems to be a bug in mypy: https://github.com/python/mypy/issues/4625\r\n\r\nAny thoughts on how to handle this?\nhard without seeing the change, create the PR so I can see it.\nBasically, the type of the `params` parameter specified in `GenericModel.__class_getitem__` is incompatible with the `Type[Any]` in the `get_args` method, according to `mypy`. As far as I can understand, `Type[Any]` is supposed to allow any type, including `Union` and `Tuple`. It makes sense to me that this is a mypy bug, but I might have misread the mypy issue, as the issue is not exactly the same.\r\n\r\nAnyway, I'll add a test and submit the PR for you to see.\nI'd love to include this fix in v1.10.2, any chance you can submit the PR asap so I can review and merge it?":1,"As a workaround, maybe you could set the attribute type to a set? Then when a list gets passed in, it gets deduplicated automatically. Then you can override `json()` and `dict()` to convert it back to a list on the way out.\n@mdavis-xyz The idea of this feature is to validate that sequences have only unique items.\r\n\r\nCode below will show the idea:\r\n```python\r\nfrom typing import Set\r\n\r\nfrom pydantic import BaseModel, Field\r\n\r\n\r\nclass FooForm(BaseModel):\r\n tags: Set[int]\r\n\r\n\r\nfoo = FooForm(tags=[1, 1, 2]) # tags attribute will be {1, 2}\r\n\r\n\r\nclass BarForm(BaseModel):\r\n tags: Set[int] = Field(unique=True)\r\n\r\n\r\nbar = BarForm(tags=[1, 1, 2]) # will fail, because sequence has duplicate items\r\n```\r\n\r\nIf you have any questions, feel free to ask.\nThis is an interesting issue that clarifies some of the friction points with validation and casting within Pydantic. \r\n\r\nAs a workaround, it's possible to add a validator with 'pre=True' to get the desired behavior. \r\n\r\n```python\r\nfrom typing import Set, Sequence\r\nfrom pydantic import BaseModel, Field, validator\r\n\r\ndef custom_to_set(xs: Sequence[int]) -> Set[int]:\r\n items = set([])\r\n for item in xs:\r\n if item in items:\r\n raise ValueError(f\"Duplicate item {item}\")\r\n else:\r\n items.add(item)\r\n return items\r\n\r\n\r\nclass Record(BaseModel):\r\n tags: Set[int] = Field(...)\r\n\r\n @validator('tags', pre=True)\r\n def validate_unique_tags(cls, value):\r\n # raise ValueError or a set\r\n return custom_to_set(value)\r\n\r\ndef example() -> int:\r\n\r\n t1 = ['1', '2'] # Notice how liberal Pydantic is. This is not a validation error\r\n t2 = [1, 3, 1] # This now raises\r\n for t in [t1, t2]:\r\n print(Record(tags=t))\r\n return 0\r\n```\r\n\r\n\r\nIs this issue a bandaid for the fundamental loose casting/coercion model that Pydantic has adopted?\r\n\r\nhttps://github.com/samuelcolvin/pydantic/issues/1098\r\n\r\nYour proposal does seem reasonable and clarifies the default behavior of `Set[T]` in a \"strict\" mode should raise a core validation error if the input sequence has any duplicates. However, this is not how Pydantic has approached validation. Perhaps it would be better to wait until Pydantic has a coherent \"strict\" model?\r\n\r\nWith regards to the proposal, it's a bit counterintuitive to define a `Set[int]` and also set `Field(unique=True)` to get the validation to work \"correctly\". Similarly, `List[T] = Field(unique=True)` is counterintuitive because it's not clear why a `Set[T]` isn't being used. This case might be better solved by a custom validation/casting function with `pre=True`? \r\n\r\n\n@mpkocher This issue came up when I faced with an issue which I thought was a bug.\r\n\r\nI had a model and one of the fields had a type `Set[str]`, the model looked like:\r\n```python\r\nclass Form(BaseModel):\r\n tags: Set[int]\r\n```\r\nWhen one of the scripts tried to instantiate `Form` with duplicated items it simply cast sequence to a set, which was the wrong behavior for me script. After investigating I found that this is expected behavior, that why I create this PR)\r\n\r\nI agree with you that `List[T] = Field(unique=True)` can be a little bit confusing.\r\n\r\nRegarding #1098 it looks great and maybe it's better to return to this feature after `Strict Configuration` will be implemented.\nI'm running into similar friction points where the overly liberal casting yields surprising results. ":1,"I avoided adding `--jobs` until we decided on whether to use both `add`/`import-url` or one of them, but we will definitely need it for #5198! \nBy the way, `repo.imp_url()` already takes a `jobs=` parameter so only thing missing is a CLI arg":1,"Context: https://discordapp.com/channels/485586884165107732/485596304961962003/760249329637916682\nThis is quite an interesting bug. We do support reading only partial values, but it seems we are not making a distinction between `None` and 0/0.0 (falsy values). :slightly_smiling_face: \r\n\r\nhttps://github.com/iterative/dvc/blob/e3a7857b1352f1203504ed754482b9e308a48e2f/dvc/repo/metrics/show.py#L51\r\n\r\nThe fix is just to do `if m not in (None, {})` on that line.\r\nStill, there seems to be another bug when the metrics file contains a scalar value (i.e. json file with just `0` in it), so we might need similar checks there too.\r\n\r\nhttps://github.com/iterative/dvc/blob/e3a7857b1352f1203504ed754482b9e308a48e2f/dvc/repo/metrics/show.py#L83\r\n\r\n@rgasper, would you be interested in making a fix?\nIf you can direct me to instructions on how to setup the codebase, sure.\nSure, @rgasper, please [follow the contributing guide](https://dvc.org/doc/user-guide/contributing/core). If you have any problems, please don't hesitate to ask in the #dev-talk channel in the Discord.\r\n":1,"Initial discussion:\r\nhttps://discord.com/channels/485586884165107732/485596304961962003/933674011982983219\r\n\r\n@PietrassykFP has been setting up the credentials via environmental variables, so if the remote gets resolved properly, it should not raise issues. I created a local test aiming to verify if remote gets resolved properly and it seem to be working fine:\r\n\r\n```\r\ndef test_open_from_proper_remote(tmp_dir, erepo_dir, make_tmp_dir):\r\n default_remote = make_tmp_dir(\"default_storage\")\r\n other_remote = make_tmp_dir(\"other_storage\")\r\n\r\n with erepo_dir.chdir():\r\n with erepo_dir.dvc.config.edit() as conf:\r\n conf[\"remote\"][\"default\"] = {\"url\": str(default_remote)}\r\n conf[\"core\"][\"remote\"] = \"default\"\r\n conf[\"remote\"][\"other\"] = {\"url\": str(other_remote)}\r\n\r\n erepo_dir.dvc_gen({\"foo\": \"foo content\"}, commit=\"create file\")\r\n erepo_dir.dvc.push(remote=\"other\")\r\n\r\n (erepo_dir / \"foo\").unlink()\r\n shutil.rmtree((erepo_dir / \".dvc\" / \"cache\"))\r\n\r\n assert not (\r\n default_remote / \"6d\" / \"bda444875c24ec1bbdb433456be11f\"\r\n ).is_file()\r\n assert (other_remote / \"6d\" / \"bda444875c24ec1bbdb433456be11f\").is_file()\r\n\r\n with api.open(\"foo\", repo=os.fspath(erepo_dir)) as fd:\r\n result = fd.read()\r\n\r\n assert result == \"foo content\"\r\n```\r\n\r\nIt would be good to reproduce the problem and create a test, though that needs some more investigation.\nprobably related to https://github.com/iterative/dvc/issues/6930 (untracked files being removed on post-run apply)\nOnly occurs if `--set-param` modifies an untracked params file and `--temp` or `--queue` flag is passed. \r\n\r\nThe untracked params file gets added `scm.add` on [`_update_params`](https://github.com/iterative/dvc/blob/dbfe88510ff1185ba83c6b7d635275232f6ba086/dvc/repo/experiments/queue/base.py#L332) and stashed to [`stash_rev`](https://github.com/iterative/dvc/blob/dbfe88510ff1185ba83c6b7d635275232f6ba086/dvc/repo/experiments/queue/base.py#L406).\r\n\r\nWhen using `WorkspaceExecutor`, [`init_git`](https://github.com/iterative/dvc/blob/d0eda1d5385ba6a78247528327563b536a561b78/dvc/repo/experiments/executor/local.py#L166) applies a `merge` on the current git repo, \"restoring\" the params file in the user workspace.\r\n\r\nWhen using `TmpDirExecutor`, the `merge` is applied on the temp dir git repo, so the params file is never \"restored\" in the user workspace.\r\n\nIt seems like the behavior is expected then. However, maybe we can clarify in the docs that experiment files should be tracked by either Git or DVC?\nI stumbled over this today and found it at least \"unexpected\" and did not know how to fix it, until I came here.\nYes, I think I was incorrect to say it is expected behavior. In fact, I ran into it myself and was confused recently (see #8256). Should we be applying the merge on top of both the tmp dir and the workspace @pmrowla?\nApplying the merge on the workspace isn't the correct behavior, that would put `-S` modified params into the workspace and not the original params file.\r\n\r\nI think the fix for this should just be to use `stash_workspace(include_untracked=True)` here\r\nhttps://github.com/iterative/dvc/blob/55b16166c852a72e8dd47d4e32090063d27497e4/dvc/repo/experiments/queue/base.py#L320\r\n\r\nWhen we leave that context it is supposed to restore the workspace to the state before any DVC exp related changes/operations were done. `include_untracked` was omitted because we aren't supposed to be touching untracked files at all in exps, but the bug is we actually can modify untracked files in the params file case.":1,"Hello @snazzyfox \r\nUnfortunately we currently have some [custom logic](https://github.com/samuelcolvin/pydantic/blob/master/pydantic/schema.py#L820), which doesn't support `Frozenset` as the origin is `frozenset`.\r\nWe could probably just add a `if issubclass(origin, frozenset) ...` and add the immutability in `conset` or duplicate some logic to have a `confrozenset` \nThanks for taking a look! This totally makes sense. \r\n\r\nI think whether we create `confrozenset` or `conset(frozen=True)` depends on if we want to also duplicate the `ConstrainedSet` class. The code for frozen sets will most probably be almost identical, just with a different base class. If there's a way we can update/reuse the existing class, adding a immutable option to `conset` would make more sense.":1,"Great point! Our internal API function dvc/project.py:Project.status() actually returns a dict, which then gets printed in dvc/command/status.py, so it should be pretty easy to implement.\nJust need to add `--json` option in the dvc/cli.py for `dvc status` and then process it in `dvc/command/status.py` and json.dump() it, instead of printing as usual.\nYeah I took the Project.status() in mind, I'm starting to dive in the code 🤓\r\n\r\nI would additionally include the `callback`, `locked` and `checksum_changed` boolean values explicitly so that the status can be explained. This would also be useful in the human readable output IMO.\r\n\r\nAnd another thing, I'm thinking it would be useful to have separate `outs_changed` and `outs_missing` since the consequences are a bit different and should probably be reflected in the status icon - I would go for red with changed outputs and dark grey with missing outputs. I'm guessing users can pull someone else's repository and work with most DVC files without the outputs and I don't want the icons to scream in red. But when there's a mismatch in the output file's checksum, we should take that as a warning so red color makes sense.\nAlso, showing a status icon means that I have to turn these stage status properties into a single distinct status icon. Since it would be too much to have an icon for all the combinations, the way I see it is to process the properties by severity to produce something like this:\r\n\r\nIf locked -> locked (yellow lock icon overlay?)\r\nElse if any outputs changed -> outs_changed (red)\r\nElse if any outputs missing -> outs_missing (grey)\r\nElse if md5 changed -> checksum_changed (blue)\r\nElse if any dependencies (`--with-deps`) changed or missing -> deps_changed (orange)\r\nElse -> ok (original DVC colored icon)\r\n\r\nWe could also independently show `--always-reproduce` using some overlay, e.g. a yellow dot in bottom left.\r\n\r\nMaybe that logic should actually be done internally and shown in an additional field like `\"status\": \"deps_changed\"`. There could even be a `--simple` option that would show just this field in human readable / machine readable format.\r\n\n@prihoda Sounds amazing! But how would we handle a bunch of changed things? E.g. deps and outs changed. Black icon?\nPersonally I wouldn't go for those combinations, I would just process it from most severe to least severe and show the first one using the if-else approach. When the file is open, we can show a detailed description. If you consider all combinations of outputs (changed, missing, ok), dependencies (changed, ok) and checksum (changed, ok), it's 3x2x2 = 12 combinations.\r\n\r\nBut I'm definitely open for discussion on this. We could enumerate those combinations that might make sense to be shown explicitly and decide on each one based on the different use-cases. In my view, for a file with invalid outputs, I already know that it should be reproduced or pulled so I don't care that dependencies were changed as well.\r\n\r\nWe could each property with a different marker - like circles in bottom left and right corners, but that might start to become quite busy. I will try to experiment in Photoshop, it will be much easier to decide visually.\nMoving the discussion here: https://github.com/iterative/intellij-dvc-support-poc/issues/1 \nClosing this in favor of https://github.com/iterative/intellij-dvc/issues/1 .\nOops. sorry. This is still very relevant, reopening.\nSome implementation details here: https://github.com/iterative/dvc/issues/3975#issuecomment-640815774\r\n\r\n\nHello! So, I think this is a very useful feature to implement, because it gives the possibility to use it for integrations in IDEs, which is my case. Since I'm developing a plugin that makes use of dvc, it would be very interesting to have the possibility to run the dvc status and create a file with the output as you do when creating dvc pipelines. I also think that you should use YAML (like you do in .dvc files) or JSON so that it can be easily parsed in different languages (for example, I am making my java plugin). ":1,"We have already had a test about this.\r\n\r\nhttps://github.com/iterative/dvc/blob/68897aa0def4e509a27d75f2e78106495d08e0c4/tests/func/test_ls.py#L167-L173\r\n\r\nand it was introduced from #3246 at the beginning of `dvc list` command.":2,"@mroutis could you give more context please? \nSure, @shcheklein , let me edit the description :sweat_smile: . \n@mroutis @Suor Is this still relevant? There was some dedup optimization in brancher.\n@efiop , I'd say it is a priority 3 and more like an enhancement.\r\n\r\n```bash\r\ngit init\r\ndvc init\r\ndvc run -m foo 'echo 100 > foo'\r\ngit add -A\r\ngit commit -m \"metrics foo\"\r\n```\r\n\r\n```console\r\n$ dvc metrics show --all-branches\r\nworking tree:\r\n\tfoo: 100\r\nmaster:\r\n\tfoo: 100\r\n```\r\n\r\nSo, the problem is that `working tree` is being returned when you can tell that there's no difference between the current branch and the working tree (because _the HEAD is clean_ -- not sure if I'm using the correct terminology :sweat_smile: )\nOther approach is adding \"working tree\" with a comma, same as dup branches or tags. \nVotes split on priority and whether include it into the next sprint: +1s from @mroutis and @Suor, -1 from @efiop and @pared. \nGoes as bonus for next sprint if we go well. \nJust discovered that `--all-branches` and friends are noop for `dvc status` when neither `cloud` nor `remote` option is specified. So:\r\n- this issue is only about `metrics show`, other commands don't care\r\n- should fail or show a warning on a noop option use.\n@Suor Indeed, it only affects status if `-c` is also specified. So need a group of mutually required (or whatever it is called) flags there. ":1,"Inconsistency with dvc and git files. Will fix. Thanks for the report! :pray: ":1,"#4344 and this issue are related to staging in dvc-data.":1,"Would this be enough to simplify it?\r\n\r\n```\r\n$ dvc plots templates --help\r\nusage: dvc plots templates [-h] [-q | -v] [-l] [-o ] [] # Simplify usage\r\n...\r\n$ dvc plots templates -l # Add -l to show templates\r\nsimple\r\nlinear\r\n...\r\n$ dvc plots templates simple\r\nTemplates have been written into '.dvc/plots'.\r\n$ dvc plots templates invalid # Show appropriate error if invalid template arg passed.\r\nERROR: 'invalid' is not a valid template.\r\n```\r\n\nYep, it's not clear what why we need `-l` in this case. It can behave similar to `git tag`, `git branch`, `dvc cache dir`, etc - show something useful by default.\r\n\r\nMake sense to add `--all`? not sure.\nI was trying to avoid breaking changes here.\r\n\r\nAlso, I think of it as closer to `dvc config` where the command primarily serves to write but also has an option to show info and exit 🤷 .\r\n\r\n> show something useful by default.\r\n\r\n`dvc plots templates` by default dumps all built-in plots templates. I think it's expected that this is useful and probably the most common usage pattern. That way, you can inspect not only the template names but also their contents.\r\n\r\n> Make sense to add `--all`?\r\n\r\nWhat would `--all` do? Are you suggesting that `dvc plots templates` should only act on a single template unless `--all` is provided? It currently supports a template name as an optional argument but acts on all templates otherwise.\r\n\r\nUltimately, I would have no problem redesigning the CLI if starting from scratch. Is there enough reason to make breaking changes here?\nAll things I'm saying are not strong opinions, command is not critical. It just feel too niche and interface indeed doesn't remind anything we have in DVC and in general feels unusual. \r\n\r\n> I was trying to avoid breaking changes here.\r\n\r\nIt's not even released yet, right?\r\n\r\n> dvc plots templates by default dumps\r\n\r\ngot it. do you expect by chance that you would need a bit more? modify, list, etc? \r\n\r\nIt means also, that we have to specify / hard code the list somewhere (since there is no list command). Initial suggestion to make it just `template` won't work. But it feels unusual and not scalable. \r\n\r\n(sorry, still feels like we have a global command for a very niche / narrow / utility like scenario)\r\n\r\n> Are you suggesting that dvc plots templates should only act on a single template\r\n\r\nYes, I didn't check the default behavior now. Since it dumps files can be a bit too intrusive?\r\n\r\n\r\n\r\n\r\n\r\n\nYeah, not critical, and maybe this command isn't necessary 🤷 . I'm trying to minimize additional work and changes on it 😅, but we should make changes if we identify obvious improvements.\r\n\r\n> It's not even released yet, right?\r\n\r\nDocumentation is lagging on it, but it was included several minor versions ago and has been recommended to users who have asked. Not a big deal, but obviously let's err on the side of consistency until we identify changes worth making.\r\n\r\n> got it. do you expect by chance that you would need a bit more? modify, list, etc?\r\n\r\nI would expect more that we may need more dump flags like `--force` or the existing `-o`, which is why I'm not crazy about listing by default and adding `--dump`. Dumping by default seems unusual and intrusive, but I think users often need it so they can inspect and modify the JSON files.\r\n\r\nDo you envision a broader set of template commands? Is it because of the command name (maybe `dvc init plots/templates` would be more intuitive)? Template subcommands seem intuitive but also could be premature, and we have so far avoided a 3rd level of nesting like `dvc plots templates list/dump`.\r\n\r\n> It means also, that we have to specify / hard code the list somewhere (since there is no list command).\r\n\r\nDumping them is the way to see them (and inspect or modify them) -- similar to how we used to point to `.dvc/plots` to see them. A couple ideas how we can improve it:\r\n\r\n1. `dvc remote add --help` links to the docs to show all supported remote urls. We could do the same for templates.\r\n\r\n```\r\n$ dvc remote add --help\r\n...\r\n\r\npositional arguments:\r\n name Name of the remote\r\n url Remote location. See full list of supported URLs at \r\n...\r\n```\r\n\r\n2. What if we list the templates that were dumped?\r\n\r\n```\r\n$ dvc plots templates\r\nTemplates have been written into '.dvc/plots':\r\nsimple\r\nlinear\r\nconfusion\r\n...\r\n```\n> A couple ideas how we can improve it:\r\n\r\nWe can, but still, looking 3rd time into the command, I still feel that this default behavior is too intrusive (write things into files by default ... and yes, it's better to have a message like `Templates have been written into '.dvc/plots'` at least).\r\n\r\n> but I think users often need it so they can inspect and modify the JSON files.\r\n\r\nmy 2cs - still don't feel it justifies this default :) Also, we should be consistent (not sure we have some good analogs in this case though). \r\n\r\nI would just change it to list and would add `-dump-all` or just `-all` to dump them all.\r\n\r\n> Do you envision a broader set of template commands?\r\n\r\nno, I don't :) agreed that it's premature to do things like 4th level sub-commands, `dvc init templates`, etc. But even by doing list by default it feels you will have more flexibility in the future if needed (?) - this is just intuition primarily.\r\n \nhttps://github.com/iterative/dvc-render/issues/8 is an example where we would have to update the list of templates in a few places?\n> [iterative/dvc-render#8](https://github.com/iterative/dvc-render/issues/8) is an example where we would have to update the list of templates in a few places?\r\n\r\nI think we should just replace the [hardcoded names](https://github.com/iterative/dvc/blob/954de0cae44e31dfcf45630a2cc7e7f5acc7f00c/dvc/commands/plots.py#L225-L232) with something like :\r\n\r\n```python\r\nfrom dvc_render.vega_templates import TEMPLATES\r\nTEMPLATE_CHOICES = [x.default_name for x in TEMPLATES] \n@shcheklein I'm still struggling to envision the command 🤔 .\r\n\r\nThe default could look like:\r\n\r\n```bash\r\n$ dvc plots templates\r\nsimple\r\nlinear\r\nconfusion\r\n...\r\n```\r\n\r\nIf you are listing them all by default, `--all` seems like a non-intuitive option to dump them, so maybe just `--dump`?\r\n\r\n```bash\r\n$ dvc plots templates --dump\r\nTemplates have been written into '.dvc/plots'\r\nsimple\r\nlinear\r\nconfusion\r\n...\r\n```\r\n\r\nWould you keep a way to get a single template? It's probably not strictly needed but is nice to have if you know you only want to modify a specific template. `dvc plots templates linear` wouldn't make much sense if it just lists the template though. Or should `dvc plots templates linear` print the template to stdout (it complies with the https://clig.dev/#the-basics rule to send output to stdout)?\r\n\r\nExample syntax:\r\n\r\n```bash\r\n$ dvc plots templates simple\r\n{\r\n \"$schema\": \"https://vega.github.io/schema/vega-lite/v5.json\",\r\n \"data\": {\r\n \"values\": \"\"\r\n },\r\n...\r\n```\r\n\r\nWhat about `-o`? Again, it's probably not strictly needed, but it's helpful if you want to dump a template without fear of deleting/overriding existing templates. Maybe `--dump` isn't needed and `-o` can signal wanting to dump to disk? I prefer that to having `--dump` and `-o`, but it could mean getting rid of the default output dir, which may be useful if we are keeping that as a default plots directory. Also, would it be obvious that `-o/--dump` could be used either for an individual template or for all templates at once?\r\n\r\nExample syntax:\r\n\r\n```bash\r\n$ dvc plots templates -o plots_dir\r\nTemplates have been written into:\r\nplots_dir/simple.json\r\nplots_dir/linear.json\r\n...\r\n$ dvc plots templates simple -o plots_dir\r\nTemplates have been written into:\r\nplots_dir/simple.json\r\n```\r\n\r\nOverall, there are some changes I like but it still feels clunky to me since the default is to list the templates while every other option involves dumping.\ngood stuff @dberenbaum !\r\n\r\n> If you are listing them all by default, --all seems like a non-intuitive option to dump them\r\n\r\nagreed\r\n\r\n> Would you keep a way to get a single template?\r\n\r\nyep, feels it's nice to have, I would try to make it happen\r\n\r\n> dvc plots templates linear print the template to stdout\r\n\r\n🤔 sound reasonable\r\n\r\n> What about -o? \r\n\r\nagain, sounds reasonable\r\n\r\n> Overall, there are some changes I like but it still feels clunky to me since the default is to list the templates while every other option involves dumping.\r\n\r\nyes, still feels like a great improvement\r\n\r\nprobably we can find a lot of example where default does one thing and specifying a target another. \r\n\r\ne.g.:\r\n\r\n> If --list is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. ...\r\n\r\nif you pass a target it'll create a new branch.\r\n \r\n\r\n\r\n\n@shcheklein tldr you prefer the suggested syntax to the current one? 😄 \r\n\r\nI have no strong preference except that we nail down exactly the expected syntax before we spend more time on this command.\r\n\r\n@pared WDYT?\nI think that the simplest seems to be just list available templates on `dvc plots templates` and `dvc plots templates {name}` would print to stdout. No dumping all templates, no `.dvc/plots` behavior - just let user do whatever they want. That is simple and easy to understand.":1,"Page source:\r\n\r\n```html\r\n\r\n\r\n\r\n\r\n DVC Plot \r\n \r\n \r\n \r\n\r\n\r\n \r\n\r\n\r\n\r\n```\nThat's pretty strange, works for me just fine:\r\n```\r\n\r\n--\r\n | \r\n | \r\n | DVC Plot \r\n | \r\n | \r\n | \r\n | \r\n | \r\n | \r\n | \r\n | \r\n | \r\n```\n@jorgeorpinel did you use standard templates?\n> ```\r\n> \r\n> --\r\n> | \r\n> | \r\n> ...\r\n> ```\r\n\r\nTehehe copy paste from Chrome \"view source\" introduces a bunch of characters (works properly with ctrl+shift+v for me).\n> did you use standard templates?\r\n\r\n🤦 ! I mistakenly used the `-t train.json` flag thinking it meant `--targets` but it means `--template` ! `dvc plots diff --targets train.json` works.\nMaybe we should ~~reconsider the option letters? Or at least~~ print a warning when a provided template file does not exist or is invalid! Cc @pared Thanks!\n@jorgeorpinel It already throws if the template is not found:\r\n\r\n```\r\n(dvc-3.8.3) ➜ dvc git:(fix-3897) ✗ dvc plots diff -t sdf\r\nERROR: Template 'sdf' not found.\r\n\r\nHaving any troubles? Hit us up at https://dvc.org/support, we are always happy to help!\r\n```\r\n\r\nIt is not able to detect a bad template, that is true, but I'm not completely sure if we can do that in a general case. Seems like the best we could do is to check that it is indeed a json/yaml (once we get rid of html support), but I'm not sure we could require it to hit any quotas on anchors that it uses. CC @pared \n> not able to detect a bad template, that is true, but I'm not completely sure if we can do that in a general case\r\n\r\nMaybe let's just keep an eye on this to see if users make the same error I did and at least detect when a given template is actually a metrics file in that case (and WARN/ERROR out).\nWe can check that template is valid by checking for `DVC_METRIC_DATA` anchor. I don't see a use case where one would like to use `dvc plots` and not provide it. \r\n\r\nAlso if we are talking about JSON templates, what is a common property of a JSON specification is `$schema` field.\r\neg\r\n- for vega:\r\n`\"$schema\": \"https://vega.github.io/schema/vega/v5.json\"`\r\n- vega lite:\r\n` \"$schema\": \"https://vega.github.io/schema/vega-lite/v4.json\"`\nIt can even be done by [JSON schema validation](https://datatracker.ietf.org/doc/draft-handrews-json-schema-validation/) but seems overkill (unless there's a quick python lib that does easily).\nTaking a quick peek at available resources, https://github.com/Julian/jsonschema seems like the most popular python-based and maintained package.\r\n\r\nThe question is whether we want to include a new package for one functionality validation.\r\n\r\n If we do, it might help us solving `plot update` (if we decide to do it) from https://github.com/iterative/dvc/issues/3906 \r\n\r\nI think it would make sense.\n@pared So looks like our templates have the schema already, which validates the generated template, right? So we are covered there. The only thing that we need to validate is that the template is indeed using our anchors.\n@efiop yep, I think this would solve this issue.":1,"For the record: seems like those options are handled by aws-cli specifically, and not by the boto3 itself: https://boto3.amazonaws.com/v1/documentation/api/latest/guide/configuration.html . This will require parsing the config ourselves and applying the options where needed, inspired by aws-cli(need to look into aws-cli source to make it match). All the code related to s3 and s3 configs is in https://github.com/iterative/dvc/blob/master/dvc/tree/s3.py.\nAnother case where having this would help: https://discord.com/channels/485586884165107732/485596304961962003/804679936886571019 (when the individual files are well over 10GB, and boto3 tries to chunk them in little parts)\n@efiop I think at least we can support a subset of these variables, the stuff that goes into a `TransferConfig` (multipart_chunk_size, multipart_threshold etc) which is the real deal since it is causing people trouble when trying to upload huge files. What do you think? \nAccording to the issue from discord. I'm using S3 compatibile API, so could You also include those parameters (multipart_chunk_size, multipart_threshold) in .dvc/config? In that way .dvc/config would override the values saved in ~/.aws/config.\n> According to the issue from discord. I'm using S3 compatibile API, so could You also include those parameters (multipart_chunk_size, multipart_threshold) in .dvc/config? In that way .dvc/config would override the values saved in ~/.aws/config.\r\n\r\n@efiop what do you about this? Should we only support `~/.aws/config` to specific configurations for `s3` or have the exact same configuration options in both `~/.dvc/config` and `~/.aws/config`? ":1,"I'm on my mobile, but should be as simple as doing something like:\r\n\r\n```py\r\nclass MyModel(BaseModel):\r\n check_foo = validator('foo')(reused_validator)\r\n```\r\n\r\nHave a try and let me know if that works or doesn't work or I have the syntax slightly wrong.\n@samuelcolvin I don't think that works due to this check:\r\n\r\n```python\r\n if not in_ipython(): # pragma: no branch\r\n ref = f.__module__ + '.' + f.__qualname__\r\n if ref in _FUNCS:\r\n raise ConfigError(f'duplicate validator function \"{ref}\"')\r\n _FUNCS.add(ref)\r\n```\r\n\r\nI think we can probably fix this though.\nHere's a self contained demonstration that it doesn't currently work.\r\n```python\r\nfrom pydantic import BaseModel, validator\r\n\r\n\r\ndef double_validator(cls, value):\r\n return value * 2\r\n\r\n\r\nclass A(BaseModel):\r\n x: int\r\n\r\n double = validator('x')(double_validator)\r\n\r\n\r\nclass B(BaseModel):\r\n x: int\r\n\r\n double = validator('x')(double_validator)\r\n\r\n# pydantic.errors.ConfigError: duplicate validator function \"__main__.double_validator\"\r\n```\nHumm, possibly. We could either drop that check or make it optional.\r\n\r\nOr you could setup a validator which just calls the reused validator.\r\n\r\nMaybe `allow_name_reuse` as another argument on a validator?":1,"@gcoter, does the params.yaml exist? Can you give more verbose error message (and, your command that you tried)?\n@skshetry thanks for your quick answer! My command looks like this:\r\n```\r\ndvc run -d training.py -p config/params_1.json -p config/params_2.json:data.training,model -o trained_model/ -n training python training.py\r\n```\r\n\r\nI prefer to use JSON files so `params.yaml` does not exist in my project.\n@gcoter, is that a typo on `-p config/params_1.json` (i.e. there's no list of parameters eg: `-p config/params_1.json:loss`).\n@skshetry No, I thought that specifying `config/params_1.json` would select everything inside this file. Should I specify explicitly the keys I want to select?\n@gcoter, yes, you have to specify keys that you want.\n@skshetry Ok, indeed it works if I specify manually the keys. I thought that DVC would list all the keys by default. But I don't mind listing them myself. Thank you for your help!\n@gcoter, but, I can see it's usefulness. I'll log this as a feature request.\n@gcoter, another question, why do you choose to `-p` rather than tracking whole file? for granularity tracking of parameter values, right?\n@skshetry I am at the beginning of the project, so it is not very clear in my mind, but I would like to benefit from the `dvc params diff` command. Basically, if I use `-d`, I cannot diff the params. Well, I could use `git diff` but `dvc params diff` formats the diff in a nice way in my opinion. And since this file is actually used to store configuration settings, it makes sense to me to use `-p`.\n#### Simple workaround for json files\r\n\r\nDefine bash functions in `.bashrc`\r\n\r\n```\r\nfunction print_json_keys {\r\n json_file=$1\r\n if [ \"$2\" ]\r\n then\r\n sep=\"$2\"\r\n else\r\n sep=','\r\n fi\r\n jq -r '[paths | join(\".\")]' $1 | sed -n 's/\\ *\"\\(.*\\)\",*/\\1/p' | head -c -1 | tr '\\r\\n' $sep\r\n}\r\n\r\nfunction get_all_dvc_json_params {\r\n json_file=$1\r\n echo \"$json_file:$(print_json_keys $json_file)\"\r\n}\r\n```\r\n\r\nthen use, assuming you have params in `config.json`\r\n\r\n```\r\ndvc run -p $(get_all_dvc_json_params config.json)\r\n```\r\n\r\n@skshetry let me know if you think it makes sense to add this as default behavior for DVC when the parameters are not defined. I can to take add this to DVC if I receive some guidance.\nFor future reference, the file must be named `params.yaml`, not `params.yml` for DVC to see it.\n@lambdaofgod, sure, go ahead. We might just need to support it as `-p params.yaml` or `-p params.json` (without explicit `:`). \r\nBut, the main question is, what the behavior should be.\r\n\r\n1) Should it work like your script, i.e. fetch all params and track each of them individually?\r\n2) Or, should it just act like other output dependencies, in that the stage reproduces if you add/delete any params in the file?\r\n\r\nIf 1), then how should we specify them on `dvc.yaml`? Should that be limited to just this helper function?\nOption 2 makes sense to me because:\r\n\r\n1. If a new parameter is added, I would rather err on the side of being overly aggressive in detecting parameters changes rather than ignore it.\r\n2. It's clean and simple in `dvc.yaml` (list the file instead of breaking out each individual key).\r\n3. It seems consistent with how YAML section keys are handled now. I don't see much difference from the current handling of `-p foo` with a `params.yaml` like:\r\n\r\n```yaml\r\nfoo:\r\n bar: 1\r\n baz: 2\r\n```\r\n\nWe have two choices on syntax in `dvc.yaml`.\r\n\r\n#### 1. Using `null` to indicate track everything\r\n```yaml\r\nparams:\r\n - params.yaml:\r\n - config.yaml:\r\n```\r\n\r\n Pros:\r\n 1. This does not require us to create our own syntax/DSL, it is YAML.\r\n 2. (Better schema?)\r\n \r\n\r\n Cons:\r\n 1. This syntax requires filename to be explicitly specified, even for `params.yaml` file which we consider as being the default.\r\n 2. The semantic meaning of `null` to mean track everything is questionable. However, it depends on the narrative we want to set. Currently, the purpose of `params` is that it can track parameters in a granular way. If we do change that to suggest that DVC can track params as a whole, but it can also support things at a granular level, it does make sense as well.\r\n (This is closer to implementation).\r\n\r\n#### 2. Using `*`\r\n```yaml\r\nparams:\r\n - * # means track everything from params.yaml\r\n - config.yaml:* # means track everything from config.yaml\r\n```\r\n\r\nPros:\r\n1. Supports tracking `params.yaml` easily by just using `*`.\r\n\r\n Cons:\r\n1. Requires us to create our own DSL, which may be confused with being a regex.\r\n\r\n\n> We have two choices on syntax in `dvc.yaml`.\r\n\r\nWhy it's not possible to support the following?\r\n\r\n```yaml\r\nparams:\r\n - custom_params.yaml # full file\r\n - foo # dvc will search for this as usual\r\n```\r\n\nIt is ambiguous. The `foo` may be a params file, and `custom_params.yaml` may be just a hyperparameter `yaml` nested inside `custom_params`. \r\n\r\nNote that this is only a metadata, and the files don't have to necessarily be present in the workspace, eg: the file could have been deleted or be read from certain revisions, etc. so the fallback approaches are going to be ugly.\r\n\n> It is ambiguous. The `foo` may be a params file, and `custom_params.yaml` may be just a hyperparameter `yaml` nested inside `custom_params`. \r\n\r\nI find it more intuitive than the other syntax, this is what users usually try first and report as a bug when it fails.\r\n\r\nFor conflicts, we can document the behavior and add priority for resolving: `checking if {name} is in params.yaml > checking if {name} is a file and exists`. Although, tbh, I don't think it's common to use a parameters file without extension nor name a parameter with a extension.\r\n\r\n> Note that this is only a metadata, and the files don't have to necessarily be present in the workspace, eg: the file could have been deleted or be read from certain revisions, etc. so the fallback approaches are going to be ugly.\r\n\r\nNot sure if I understand why this is an issue only with this syntax\r\n\nIt's better to avoid ambiguity if possible. And, `diff` and `status` have stronger requirements.\r\nFor example, what will you show `dvc status` for `foo` if the `foo` file and `params.yaml` both don't exist at all? \r\n\r\nAlso `dvc` supports any arbitrary file (it just fallbacks to yaml), so `foo.bar` could be a params file or an xpath to that parameters.\r\n\r\n> I find it more intuitive than the other syntax, this is what users usually try first and report as a bug when it fails.\r\n\r\nI know it's intuitive, but I don't think we have a much better choice. Given that we consider this to be an advanced feature, it's okay to consider it as a tradeoff.\n> ```yaml\r\n> params:\r\n> - custom_params.yaml # full file\r\n> - foo # dvc will search for this as usual\r\n> ```\r\n\r\nI think we could come up with consistent logic to deal with ambiguities here, so I think we should focus on whether the intuitiveness/convenience outweighs the ambiguity.\r\n\r\nCan we assume any param that ends in `.yaml`, `.yml`, `.json`, `.toml`, or `.py` is a file path, and otherwise it's not? Is there a realistic scenario when this would be problematic?\r\n\r\n> It's better to avoid ambiguity if possible. And, `diff` and `status` have stronger requirements.\r\n> For example, what will you show `dvc status` for `foo` if the `foo` file and `params.yaml` both don't exist at all?\r\n\r\nDoesn't the use of `.` to specify nested keys already introduce ambiguity (how do we know whether this is a nested key or just a top-level key with `.` in it)? Is this different?\r\n\r\n> Also `dvc` supports any arbitrary file (it just fallbacks to yaml), so `foo.bar` could be a params file or an xpath to that parameters.\r\n\r\nAren't parameters limited to particular file types, and dvc uses the file extension to determine the type? It seems like the only added ambiguity is when dvc falls back to yaml, and I don't think it's unreasonable to expect `.yaml` or `.yml` there.\n> Can we assume any param that ends in .yaml, .yml, .json, .toml, or .py is a file path, and otherwise it's not? Is there a realistic scenario when this would be problematic?\r\n\r\nIt's a weird restriction to not be able to track keys named `yaml`/`yml`/json`/`toml`/`py`. These file extensions are likely to expand in the future.\r\n\r\n> Doesn't the use of . to specify nested keys already introduce ambiguity (how do we know whether this is a nested key or just a top-level key with . in it)? Is this different?\r\n\r\nWe don't support the keys with `.` at all. `.` is strictly a separator.\r\n\r\n> Aren't parameters limited to particular file types, and dvc uses the file extension to determine the type? It seems like the only added ambiguity is when dvc falls back to yaml, and I don't think it's unreasonable to expect .yaml or .yml there.\r\n\r\nyes, DVC uses file extensions to determine the type and falls back to yaml parser which supports `json` and `yaml` contents.\r\n\r\nOverloading the schema to track parameters in granular and in whole may be confusing. \r\n\r\n\n> ```yaml\r\n> params:\r\n> - params.yaml:\r\n> - config.yaml:\r\n> ```\r\n\r\nHow will this work in CLI? `dvc stage add -p config.yaml:`? Will that cause any issues?\r\n\r\n> It's a weird restriction to not be able to track keys named `yaml`/`yml`/json`/`toml`/`py`. These file extensions are likely to expand in the future.\r\n\r\nI think we can document that supported file extensions cannot be used as parameter keys.\r\n\r\n> yes, DVC uses file extensions to determine the type and falls back to yaml parser which supports `json` and `yaml` contents.\r\n\r\nSo if we rely on file extensions, the breaking changes would be:\r\n* Parameter keys like `yaml` or other file extensions are no longer supported.\r\n* YAML/JSON parameter files can't use nonstandard extensions.\r\n\r\n@skshetry Does that all sound right? If you think there's a good way to go with option 1 and have the CLI make sense without introducing breaking changes, I'm fine with that. Otherwise, I think the file extension approach is intuitive and the breaking changes aren't too bad as long as we document them.\n@daavoo mentioned that tracking params directories could come up in the future. It seems like option 1 would be better if we want to make future changes like this easier.":1,"@efiop , related? https://github.com/iterative/dvc/issues/2210\nWhat is the reasoning for not writing `wdir`? We actually have [test](https://github.com/iterative/dvc/blob/41351a2df2f36ed04846d5e3d976d6d99b71a151/tests/func/test_run.py#L563) checking that wdir `.` is written.":1,"Thanks for reporting, see the discussion on #2437, this is rooted in a wider problem which I'm fixing now.":1,"Hi @ArcArcaman and thanks for reporting!\r\nI feel like this issue has already been discussed and if I'm not mistaken [there is already a fix](https://github.com/samuelcolvin/pydantic/pull/2170) 😉 \r\nMaybe you can have a look to check if it indeed solves your problem.\r\nHappy holidays ❄️ \nOh okay, thanks @PrettyWood! Yeah, it seems like it will solve my issue if the fix is merged. Sorry for the duplication, can't find it myself 😄 Happy holidays to you too ⛄ ":1,"Thanks @karajan1001! Is this causing a significant slowdown in queuing many experiments? Are there other issues caused by the current behavior?\n> Thanks @karajan1001! Is this causing a significant slowdown in queuing many experiments? Are there other issues caused by the current behavior?\r\n\r\nIt depends on the complexity of the `Git` repo and the time cost of the training progress. The demo repo provided by the `vs-code` extension team is `Git` history complex and training quickly. This makes that it causes significant performance slowdown. By comparison, in my past experience, most of the ML repo is the opposite. Trainning costs hours or days, so it will only have a limited effect on time cost. But the problem is that most of the demos to show to the users would not be such a long training one.\r\n\r\n\n@karajan1001 Is this during `exp run --queue` or during `queue start/exp run --run-all`? I'm not seeing anything that looks painfully slow when messing with queuing a few experiments in https://github.com/iterative/vscode-dvc-demo.\nDuring `queue start -j n` when `n > 1`, this functionality hasn't been integrated into `vscode` extension. \nI'm starting from the command line using that repo. Are you seeing slowdown during `exp run --queue` or during `queue start`?\n> I'm starting from the command line using that repo. Are you seeing slowdown during `exp run --queue` or during `queue start`?\r\n\r\nIt is not about slowdown but about the experiments running in sequence even if I started several workers. The reason for this is that we use an SCM lock during the initialization progress. And because 1. the workers are only reading each of the stashes, 2. The queue stashes are different for different workers. So we can make some modifications and then release the lock, and make the workers run in parallel.\r\n\r\n\n> The queue stashes are different for different workers\r\n\r\nIs this the way it's supposed to work? I would think they would consume tasks from the same queue.\n> > The queue stashes are different for different workers\r\n> \r\n> Is this the way it's supposed to work? I would think they would consume tasks from the same queue.\r\n\r\nThe queue itself is thread safety, but no one can guarantee that the stash queue is too. For example, If I use `git stash list` first to find the desired stash, and then want to `git stash pop stash@{n}` it. But in the interval time, some other processes did some operation on the stash queue. ":1,"yes, very likely related to `Optional[]`. What happens if you used `List['NestedTuple']`?\nLooks like it fails in the same way. This test passes:\r\n```python\r\nfrom typing import List, Tuple\r\n\r\nfrom pydantic import BaseModel\r\n\r\n\r\ndef test_parse_nested_tuple():\r\n class NestedTuple(BaseModel):\r\n x: Tuple[int, List[\"NestedTuple\"]]\r\n\r\n obj = NestedTuple.parse_obj({'x': ('1', [{'x': ('2', [{'x': ('3', [])}])}])})\r\n assert obj.dict() == {'x': (1, [{'x': ('2', [{'x': ('3', [])}])}])}\r\n\r\n # Note above: the 2 and 3 did not get parsed into ints !!\r\n\r\n NestedTuple.update_forward_refs()\r\n obj = NestedTuple.parse_obj({'x': ('1', [{'x': ('2', [{'x': ('3', [])}])}])})\r\n assert obj.dict() == {'x': (1, [{'x': (2, [{'x': (3, [])}])}])}\r\n```\nLooks like a problem of checking `ForwardRef`. `ForwardRef` is now checked only in `validate_model` but not in `ModelField.validate`, so an error is raised only when `ModelField.type_` is calculated `ForwardRef`. But this doesn't happen to `Tuple`.\r\nWhich means the following test passes\r\n```\r\nclass NestedTuple(BaseModel):\r\n x: Tuple[\"NestedTuple\"]\r\nobj = NestedTuple.parse_obj({'x': (AnyObject, )})\r\nassert obj.x[0] is AnyObject\r\n```\r\nMaybe we can move the checking into `ModelField` to solve this?":1,"The proper fix might require implementing something like config inheritance:\r\n- look at remote section first\r\n- look at core second\r\n- use default\r\n\r\nFor particular options like `checksum_jobs`.\r\n\r\nThis will require making config smarter most probably. So it's a research now.\nI'm starting to work on the issue":1,"I think we can expand as needed by users.\nSVG? Maybe TIFF? Uncompressed bitmaps? I'd ask CV people.\nI think that SVG is perhaps a good first addition, as plotting libraries can output that and they are often a bit smaller than PNGs. Having at least one vector format and one raster format would be a good goal. Probably not a first priority, but it would be nice!\nUnless I am missing something, this would only need to update:\r\n\r\nhttps://github.com/iterative/dvc/blob/d7152e360e4770c54645e84ca9b690389d60dd07/dvc/repo/plots/__init__.py#L556":1,"":6064,"@jorgeorpinel --single-stage is already hidden. `--file` will likely be used in the future, but could hide it for now. Will send an update.":1,"I'm beginning work on this ticket now.\nI've written up two PRs for `pre-commit`:\r\n* https://github.com/pre-commit/pre-commit/pull/1339\r\n* https://github.com/pre-commit/pre-commit.github.io/pull/307":1,"Thanks for reporting @Casyfill ! Indeed, we need to override it. We'll take a look.\nYou probably can instead just check for the xpath in the current Dvcfile, and override it with the explicit path, if needed? \n@Casyfill Yes, the explicitly specified xpath should override the one specified in a dvc file.":1,"I agree that it should, PR welcome\n@skewty in this case you are explicitly passing a value to `PanelData.validate` with `'gios_type': DIGITAL_INPUT`.\r\n\r\nYou are passing the same value as the one that would be used by default, but you are passing it explicitly.\r\n\r\nIf you don't pass an explicit value, and let the model take the default one (the same value, but using the default), then Pydantic respects the `skip_defaults`:\r\n\r\n```Python\r\nfrom typing import List\r\nfrom pydantic import BaseModel, Schema\r\n\r\nDIGITAL_INPUT = 'digital_input'\r\n\r\n\r\nclass Payload(BaseModel):\r\n \"\"\"Base class for all Combox payloads\"\"\"\r\n\r\n\r\nclass PointData(Payload):\r\n name: str = Schema(..., title='Name', min_length=1, max_length=32)\r\n gios_type: str = Schema(DIGITAL_INPUT, title='GIOS Type')\r\n\r\n\r\nclass PanelData(Payload):\r\n name: str = Schema(..., title='Name', min_length=1, max_length=32)\r\n points: List[PointData] = Schema(..., title='Points', min_length=1)\r\n\r\n\r\npd = PanelData.validate({'name': 'Dummy Panel', 'points': [{'name': 'Dummy Point'}]})\r\nassert 'gios_type' not in pd.dict(skip_defaults=True)['points'][0]\r\nprint(pd.dict(skip_defaults=True))\r\n```\r\n\r\n---\r\n\r\nI consider this behavior (the current behavior) a feature (useful), for example in this example:\r\n\r\nLet's say you have this model:\r\n\r\n```Python\r\nclass Person(BaseModel):\r\n name: str\r\n pet: str = None\r\n```\r\n\r\nYou have an item in your DB that contains:\r\n\r\n```Python\r\n{\"name\": \"alice\", \"pet\": \"orion\"}\r\n```\r\n\r\nNow let's say you receive an update to that item with:\r\n\r\n```Python\r\n{\"name\": \"bob\"}\r\n```\r\n\r\nAs `pet` is not set, you can keep the current value of `\"orion\"`, but you can update the name to `\"bob\"`. Using `skip_defaults` skips the non-existing `\"pet\"` that would be set to `None` by default.\r\n\r\nNow in your DB:\r\n\r\n```Python\r\n{\"name\": \"bob\", \"pet\": \"orion\"}\r\n```\r\n\r\nThen, if you receive an update to the same item with:\r\n\r\n```Python\r\n{\"pet\": None}\r\n```\r\n\r\nYou could update your item in the DB, marking the pet as dead (`None`).\r\n\r\nNow in your DB:\r\n\r\n```Python\r\n{\"name\": \"bob\", \"pet\": None}\r\n```\r\n\r\nIn this case, Pydantic would be smart enough to know that `pet` was intentionally and explicitly set to `None`, even when that was the default value.\r\n\r\nIt's able to distinguish between values taken by default and values set, even if the value is the same.\n@tiangolo thank you for taking the time to make such a complete reply and sorry for taking so long to get back to this.\r\n\r\n> I consider this behavior (the current behavior) a feature (useful), for example in this example:\r\n> ...\r\n> In this case, Pydantic would be smart enough to know that `pet` was intentionally and explicitly set to `None`, even when that was the default value.\r\n> \r\n> It's able to distinguish between values taken by default and values set, even if the value is the same.\r\n\r\nTo me anyway, it is surprising that \" It's able to distinguish between values taken by default and values set, even if the value is the same.\" To me, I see the feature more as a `skip_unset_defaults=True` rather than a `skip_defaults=True` because you are not really skipping default values as the parameter name suggests (to me).\r\n\r\nThat said, would an alternate parameter name be acceptable to accomplish my version be acceptable? Or perhaps some sort of additional parameter like `strict=True` which I would set to `False` to accomplish what I was looking for when I created this issue?\nI realize changing how `skip_defaults` parameter works would be a breaking change and such a change would be best done before v1.0. So this issue / discussion is coming up at a good time :)\nI'm not entirely clear what change/new feature you would like?\n@samuelcolvin I think the request is to change the `skip_defaults` argument of `BaseModel.dict` to exclude values if they are equal to the default value (whether or not it was set), and to have a new keyword argument (called `skip_unset_defaults`; I would propose just `skip_unset`) that implements the existing functionality.\r\n\r\nFor what it's worth, I also found the `skip_defaults` behavior surprising at first; `skip_unset` might have been a clearer name, especially considering most other libraries wouldn't even be *capable* of supporting the `skip_defaults` feature, so I think most people wouldn't guess that's how it works. Separately, I feel like skipping defaults (whether or not they were set) is a relatively common feature request. (For example, it would make it a lot easier to skip nulls in many cases).\r\n\r\nAt this point I'm familiar and comfortable with the existing implementation, so I'm fine either way, but I can see some merits.\n`skip_defaults` and `skip_unset` sounds reasonable to me.\r\n\r\nOne advantage is that there's no more logic required on parsing so performance (of raw parsing) would be unchanged.\r\n\r\nMy only concern is that `skip_defaults` has new behaviour but has a name that shadows a different old keyword argument which now has a new name. This will cause a lot of headaches when migrating to v1 since tests and setup won't fail immediately.\r\n\r\nOne solution would be to completely change the names to: `exclude_defaults` and `exclude_unset`. That way there can be no confusion with the names and it's more consistent with the `exclude` argument at the expensive for 3 more characters and one more syllable.\r\n\r\nWhat do you think?\nI like the consistency with `exclude`.\ndo we still want this before v1 is released?\r\n\r\nIf so it needs someone to start it in the next week or so.\nI think it's worthwhile. I'll try to get to this this weekend if no one else wants to handle it sooner.\nmight require logic shared to #898 to get the default values.":1,"this is not a bug but a feature request.":1,"More context: https://discuss.dvc.org/t/merging-of-files-in-dvc-tracked-directories/599/5":1,"> should not contain the extra .dvc/tmp/repro.dat, which is just used for dvc exp run to pass repro arguments.\r\n\r\nWe should probably not generate that file (add an option to skip?) when calling ` _stash_exp` from `experiments.save`":1,"\nShall I raise one PR to [1.9.X-fixes](https://github.com/samuelcolvin/pydantic/tree/1.9.X-fixes)\nWhat happens on 1.8.2?\nThere is no support for `unique_items` in pydantic version 1.8.2\r\n``` py\r\nclass Model(BaseModel):\r\n foo: Optional[List[str]] = Field(None, unique_items=True)\r\n\r\nModel(foo=['a','a','a'], bar=None)\r\n```\r\nWon't raise any issues (duplicate items are there in the list) and \r\n``` py\r\nclass Model(BaseModel):\r\n bar: conlist(str, unique_items=True) = Field(None)\r\n\r\nModel(bar=['a','a','a'])\r\n```\r\nWill raise an issue \r\n```\r\nTraceback (most recent call last):\r\n File \"/Users/developer/test.py\", line 1, in \r\n class Model(BaseModel):\r\n File \"/Users/developer/test.py\", line 2, in Model\r\n bar: conlist(str, unique_items=True) = Field(None)\r\n File \"pydantic/types.py\", line 509, in pydantic.types.conlist\r\nTypeError: conlist() got an unexpected keyword argument 'unique_items'\r\n```\r\n\r\nps: I need the support for `unique_items`.\nSorry, my bad. 🙈 \r\n\r\nYes, pr against that branch please.\nDid this PR ever get made? If not, I'd be happy to create it.":1,"I'm working on the issue":1,"@friggog Please post verbose log for that command. E.g. `dvc fetch -v`. Also, please post `dvc doctor` output.\n```\r\nDVC version: 2.0.3 (pip)\r\n---------------------------------\r\nPlatform: Python 3.7.9 on Windows-10-10.0.14393-SP0\r\nSupports: azure, hdfs, http, https, ssh\r\nCache types: \r\nCaches: local\r\nRemotes: azure\r\nWorkspace directory: NTFS on D:\\\r\nRepo: dvc (subdir), git\r\n2021-03-05 16:23:34,513 DEBUG: Check for update is enabled.\r\n2021-03-05 16:23:34,540 DEBUG: Trying to spawn '['daemon', '-q', 'updater']'\r\n2021-03-05 16:23:34,590 DEBUG: Spawned '['daemon', '-q', 'updater']'\r\n2021-03-05 16:23:34,619 DEBUG: Checking if stage 'FILE_1' is in 'dvc.yaml'\r\n2021-03-05 16:23:35,958 DEBUG: Checking if stage 'FILE_2' is in 'dvc.yaml'\r\n2021-03-05 16:23:35,959 DEBUG: Checking if stage 'FILE_3' is in 'dvc.yaml'\r\n2021-03-05 16:23:35,960 DEBUG: Checking if stage 'DIR\\FILE_4' is in 'dvc.yaml'\r\n2021-03-05 16:23:36,759 DEBUG: Preparing to download data from 'azure://CONTAINER_NAME'\r\n2021-03-05 16:23:36,760 DEBUG: Preparing to collect status from azure://CONTAINER_NAME\r\n2021-03-05 16:23:36,760 DEBUG: Collecting information from local cache...\r\n2021-03-05 16:23:36,760 DEBUG: Collecting information from remote cache...\r\n2021-03-05 16:23:36,761 DEBUG: Matched '0' indexed hashes\r\n2021-03-05 16:23:36,761 DEBUG: Querying 1 hashes via object_exists\r\n2021-03-05 16:23:36,765 DEBUG: failed to pull cache for 'DIR'\r\n2021-03-05 16:23:35,960 DEBUG: Checking if stage 'DIR\\FILE_5' is in 'dvc.yaml'\r\n2021-03-05 16:23:36,759 DEBUG: Preparing to download data from 'azure://CONTAINER_NAME'\r\n2021-03-05 16:23:36,760 DEBUG: Preparing to collect status from azure://CONTAINER_NAME\r\n2021-03-05 16:23:36,760 DEBUG: Collecting information from local cache...\r\n2021-03-05 16:23:36,760 DEBUG: Collecting information from remote cache...\r\n2021-03-05 16:23:36,761 DEBUG: Matched '0' indexed hashes\r\n2021-03-05 16:23:36,761 DEBUG: Querying 1 hashes via object_exists\r\n2021-03-05 16:23:36,765 DEBUG: failed to pull cache for 'DIR'\r\n\r\n... many times ....\r\n\r\n-----------------------------------------------------------\r\n2021-03-05 16:24:56,944 ERROR: failed to download 'azure://CONTAINER_NAME/e4/deb4d2426b0b5fd5919319e3eca7e7' to '.dvc\\cache\\e4\\deb4d2426b0b5fd5919319e3eca7e7' - There is no current event loop in thread 'ThreadPoolExecutor-127_2'.\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\remote\\base.py\", line 35, in wrapper\r\n func(from_info, to_info, *args, **kwargs)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\fs\\base.py\", line 280, in download\r\n return self._download_file(from_info, to_info, name, no_progress_bar,)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\fs\\base.py\", line 332, in _download_file\r\n from_info, tmp_file, name=name, no_progress_bar=no_progress_bar\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\fs\\fsspec_wrapper.py\", line 104, in _download\r\n with self.open(from_info, \"rb\") as fobj:\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\fs\\fsspec_wrapper.py\", line 48, in open\r\n return self.fs.open(self._with_bucket(path_info), mode=mode)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\fsspec\\spec.py\", line 943, in open\r\n **kwargs,\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\adlfs\\spec.py\", line 1445, in _open\r\n **kwargs,\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\adlfs\\spec.py\", line 1509, in __init__\r\n fs.service_client.get_container_client(self.container_name)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\azure\\storage\\blob\\aio\\_blob_service_client_async.py\", line 591, in get_container_client\r\n key_resolver_function=self.key_resolver_function, loop=self._loop)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\azure\\storage\\blob\\aio\\_container_client_async.py\", line 118, in __init__\r\n **kwargs)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\azure\\storage\\blob\\_container_client.py\", line 149, in __init__\r\n super(ContainerClient, self).__init__(parsed_url, service='blob', credential=credential, **kwargs)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\azure\\storage\\blob\\_shared\\base_client.py\", line 114, in __init__\r\n self._config, self._pipeline = self._create_pipeline(self.credential, storage_sdk=service, **kwargs)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\azure\\storage\\blob\\_shared\\base_client_async.py\", line 71, in _create_pipeline\r\n self._credential_policy = AsyncBearerTokenCredentialPolicy(credential, STORAGE_OAUTH_SCOPE)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\azure\\core\\pipeline\\policies\\_authentication_async.py\", line 24, in __init__\r\n self._lock = asyncio.Lock()\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\asyncio\\locks.py\", line 161, in __init__\r\n self._loop = events.get_event_loop()\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\asyncio\\events.py\", line 644, in get_event_loop\r\n % threading.current_thread().name)\r\nRuntimeError: There is no current event loop in thread 'ThreadPoolExecutor-127_2'.\r\n\r\n... many times ...\r\n\r\n------------------------------------------------------------\r\n2021-03-05 16:24:56,993 ERROR: failed to fetch data from the cloud - 53 files failed to download\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\command\\data_sync.py\", line 89, in run\r\n run_cache=self.args.run_cache,\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\repo\\__init__.py\", line 49, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"c:\\hostedtoolcache\\windows\\python\\3.7.9\\x64\\lib\\site-packages\\dvc\\repo\\fetch.py\", line 77, in fetch\r\n raise DownloadError(failed)\r\ndvc.exceptions.DownloadError: 53 files failed to download\r\n------------------------------------------------------------\r\n2021-03-05 16:24:56,997 DEBUG: Analytics is enabled.\r\n2021-03-05 16:24:57,000 DEBUG: Trying to spawn '['daemon', '-q', 'analytics', 'C:\\\\Users\\\\VSSADM~1\\\\AppData\\\\Local\\\\Temp\\\\tmpy3i7nnwh']'\r\n2021-03-05 16:24:57,052 DEBUG: Spawned '['daemon', '-q', 'analytics', 'C:\\\\Users\\\\VSSADM~1\\\\AppData\\\\Local\\\\Temp\\\\tmpy3i7nnwh']'\r\nUnclosed client session\r\nclient_session: \r\n```\r\n\r\nI'm pretty sure it is only files that are within a directory that is tracked (rather than the file itself being tracked) that are failing.\r\n\r\nAlso tried a fresh clone on my local machine and I'm getting auth errors with DefaultAzureCredentials :( \nUpdate that this problem persists on the latest version (2.0.13) and happens both locally and on CI\r\n\r\nHere is the traceback (after fixing DefaultAzureCredential see #5725)\r\n\r\n```\r\nTraceback (most recent call last):\r\n File \"python_lib\\site-packages\\adlfs\\spec.py\", line 483, in do_connect\r\n for cred in creds\r\n File \"python_lib\\site-packages\\adlfs\\spec.py\", line 484, in \r\n if cred is not None\r\n File \"python_lib\\site-packages\\azure\\storage\\blob\\aio\\_blob_service_client_async.py\", line 118, in __init__\r\n **kwargs)\r\n File \"python_lib\\site-packages\\azure\\storage\\blob\\_blob_service_client.py\", line 126, in __init__\r\n super(BlobServiceClient, self).__init__(parsed_url, service='blob', credential=credential, **kwargs)\r\n File \"python_lib\\site-packages\\azure\\storage\\blob\\_shared\\base_client.py\", line 114, in __init__\r\n self._config, self._pipeline = self._create_pipeline(self.credential, storage_sdk=service, **kwargs)\r\n File \"python_lib\\site-packages\\azure\\storage\\blob\\_shared\\base_client_async.py\", line 71, in _create_pipeline\r\n self._credential_policy = AsyncBearerTokenCredentialPolicy(credential, STORAGE_OAUTH_SCOPE)\r\n File \"python_lib\\site-packages\\azure\\core\\pipeline\\policies\\_authentication_async.py\", line 24, in __init__\r\n self._lock = asyncio.Lock()\r\n File \"python_lib\\asyncio\\locks.py\", line 161, in __init__\r\n self._loop = events.get_event_loop()\r\n File \"python_lib\\asyncio\\events.py\", line 644, in get_event_loop\r\n % threading.current_thread().name)\r\nRuntimeError: There is no current event loop in thread 'ThreadPoolExecutor-0_0'.\r\n\r\nDuring handling of the above exception, another exception occurred:\r\n\r\nTraceback (most recent call last):\r\n File \"python_lib\\site-packages\\dvc\\main.py\", line 55, in main\r\n ret = cmd.run()\r\n File \"python_lib\\site-packages\\dvc\\command\\data_sync.py\", line 40, in run\r\n glob=self.args.glob,\r\n File \"python_lib\\site-packages\\dvc\\repo\\__init__.py\", line 49, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"python_lib\\site-packages\\dvc\\repo\\pull.py\", line 38, in pull\r\n run_cache=run_cache,\r\n File \"python_lib\\site-packages\\dvc\\repo\\__init__.py\", line 49, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"python_lib\\site-packages\\dvc\\repo\\fetch.py\", line 63, in fetch\r\n used, jobs, remote=remote, show_checksums=show_checksums,\r\n File \"python_lib\\site-packages\\dvc\\data_cloud.py\", line 92, in pull\r\n show_checksums=show_checksums,\r\n File \"python_lib\\site-packages\\dvc\\remote\\base.py\", line 56, in wrapper\r\n return f(obj, *args, **kwargs)\r\n File \"python_lib\\site-packages\\dvc\\remote\\base.py\", line 491, in pull\r\n download=True,\r\n File \"python_lib\\site-packages\\dvc\\remote\\base.py\", line 328, in _process\r\n download=download,\r\n File \"python_lib\\site-packages\\dvc\\remote\\base.py\", line 176, in _status\r\n md5s, jobs=jobs, name=str(self.fs.path_info)\r\n File \"python_lib\\site-packages\\dvc\\remote\\base.py\", line 132, in hashes_exist\r\n return indexed_hashes + self.odb.hashes_exist(list(hashes), **kwargs)\r\n File \"python_lib\\site-packages\\dvc\\objects\\db\\base.py\", line 380, in hashes_exist\r\n remote_hashes = self.list_hashes_exists(hashes, jobs, name)\r\n File \"python_lib\\site-packages\\dvc\\objects\\db\\base.py\", line 338, in list_hashes_exists\r\n ret = list(itertools.compress(hashes, in_remote))\r\n File \"python_lib\\concurrent\\futures\\_base.py\", line 598, in result_iterator\r\n yield fs.pop().result()\r\n File \"python_lib\\concurrent\\futures\\_base.py\", line 435, in result\r\n return self.__get_result()\r\n File \"python_lib\\concurrent\\futures\\_base.py\", line 384, in __get_result\r\n raise self._exception\r\n File \"python_lib\\concurrent\\futures\\thread.py\", line 57, in run\r\n result = self.fn(*self.args, **self.kwargs)\r\n File \"python_lib\\site-packages\\dvc\\objects\\db\\base.py\", line 329, in exists_with_progress\r\n ret = self.fs.exists(path_info)\r\n File \"python_lib\\site-packages\\dvc\\fs\\fsspec_wrapper.py\", line 94, in exists\r\n return self.fs.exists(self._with_bucket(path_info))\r\n File \"python_lib\\site-packages\\funcy\\objects.py\", line 50, in __get__\r\n return prop.__get__(instance, type)\r\n File \"python_lib\\site-packages\\funcy\\objects.py\", line 28, in __get__\r\n res = instance.__dict__[self.fget.__name__] = self.fget(instance)\r\n File \"python_lib\\site-packages\\dvc\\fs\\azure.py\", line 114, in fs\r\n file_system = AzureBlobFileSystem(**self.fs_args)\r\n File \"python_lib\\site-packages\\fsspec\\spec.py\", line 66, in __call__\r\n obj = super().__call__(*args, **kwargs)\r\n File \"python_lib\\site-packages\\adlfs\\spec.py\", line 403, in __init__\r\n self.do_connect()\r\n File \"python_lib\\site-packages\\adlfs\\spec.py\", line 500, in do_connect\r\n raise ValueError(f\"unable to connect to account for {e}\")\r\nValueError: unable to connect to account for There is no current event loop in thread 'ThreadPoolExecutor-0_0'.\r\n```\r\n\r\n```\r\n2021-03-30 08:55:25,226 DEBUG: Version info for developers:\r\nDVC version: 2.0.13 (pip)\r\n---------------------------------\r\nPlatform: Python 3.7.10 on Windows-10-10.0.19041-SP0\r\nSupports: azure, http, https\r\nCache types: hardlink\r\nCache directory: NTFS on C:\\\r\nCaches: local\r\nRemotes: azure\r\nWorkspace directory: NTFS on C:\\\r\nRepo: dvc (subdir), git\r\n```\nAfter some further investigation, this issue seems to arise because `adlfs` uses `azure.identity.aio` and `azure.storage.blob.aio ` which both use `asyncio`. Because DVC uses `ThreadPoolExecutor` at various points (e.g. [here](https://github.com/iterative/dvc/blob/a1aab35f997a1f9175f945f8266cf4038a5715b8/dvc/remote/base.py#L364) and [here](https://github.com/iterative/dvc/blob/a1aab35f997a1f9175f945f8266cf4038a5715b8/dvc/fs/base.py#L306)) without any handling for `asyncio` this causes the failures above where there is no event loop available to `aysncio` within threads of the `ThreadPoolExecutor`. Disabling uses of `ThreadPoolExecutor` within DVC results in pulls from Azure succeeding. \r\n\r\n@isidentical @efiop \r\nI'm a little confused why nobody else seems to have this issue? Also not sure what is the best path for a reliable fix - I have no experience with `asyncio`...\n@friggog, could you please try installing adlfs from the master? It could have been fixed in upstream.\r\n```console\r\n$ pip install git+https://github.com/dask/adlfs.git\r\n```\r\n\nNope same error @skshetry \n@isidentical have you managed to repro this at all?\n> @isidentical have you managed to repro this at all?\r\n\r\nNo, unfortunately, I haven't encounter this error. If you can share your specific conditions (which login method are you using, which operation it is exactly failing etc) I'll try to work on it. \nI'm using the DefaultAzureCredential with cached azure CLI credentials (run `az login` before DVC commands) and also ServicePrincipleAuth on Devops CI. Both have the same error with `dvc fetch some_files`\nI've reproduced your issue @friggog via using `DefaultCredentials`. The fix is simple though it is a bit in the gray line on whether we should fix it on the dvc itself or on the adlfs so I've opened a question on the adlfs upstream dask/adlfs#218\n@isidentical In the interest of making this functional for DVC users can we fix it here now even if not the perfect solution, then if eventually it gets fixed in adlfs the alterations can be removed from DVC?":1,"Related to https://github.com/iterative/dvc/issues/3182 , as we will also need to download .dir cache files and parse them for this functionality.\nThis will be a very useful change, +1 \nClosing this in favor of https://github.com/iterative/dvc/issues/4107 , since it is newer. I have a WIP PR that should be ready later today. ":1,"Context https://discordapp.com/channels/485586884165107732/485596304961962003/565909315945365544\nWill this the correct output\r\n\r\n```\r\n$ dvc diff f722af7 91cdc34\r\n\r\ndvc diff from f722af74ec372073d04847a3c77ff7e7a154a21b to 91cdc345625ded08cb50f5616f41cee73b198bb6\r\n\r\ndiff for 'test'\r\n-test with md5 cd5a9abdb72acc541fecb818c8280d5c.dir\r\n+test with md5 3d681d1fe5b39802f663c9a82600d219.dir\r\n\r\n0 files not changed, 1 files modified, 0 files added, 0 files deleted, size was increased by 3 Bytes\r\n\r\n```\r\n\r\n?\r\n\r\nNamely, `1 files modified` is the only difference from what it shows currently. \r\n\r\nAnd `changed`? Are \"modified\" and \"changed\" different in this context?\n@GildedHonour \"0 files _not_ changed\". Yes, I think this is the only difference. We need to fix that. Feel free to fix `not changed` part so it's less confusing. We will need to update the docs if needed and write a test for this.\n@shcheklein Okay\r\n\r\n`1 files changed, 1 files modified, 0 files added, 0 files deleted, size was increased by 3 Bytes`\r\n\r\n \n@GildedHonour so, let's imagine we have 10 files in the directory and we change only one of them:\r\n\r\n`9 files _not_ changed, 1 files modified, 0 files added, 0 files deleted, size was increased by 3 Bytes`\r\n\r\nThis is the intended output in this case ^^\r\n\r\nSince, I see that the phrase `9 files _not_ changed` is confusing, may be we can change the it a little bit (preserving the semantics of course). \nAlright. I've fixed it I think. \r\n\r\nI'm working on the tests.\nthere're 2 tests in `func/test_version.py` will fail, they're probably unrelevant to my changes. They may have to do wit my OS -- MacOS. Should I fix them?\r\n\r\n\r\n1)\r\n\r\n dvc_repo = Repo: '/private/var/folders/qr/0v5z71xn7x503ykyv1j6lkp00000gn/T/dvc-test.28819.vk4jnw5_.DAdbZ4bwgScCFRGEbwNNfJ'\r\n caplog = <_pytest.logging.LogCaptureFixture object at 0x1258c6210>\r\n\r\n def test_info_in_repo(dvc_repo, caplog):\r\n assert main([\"version\"]) == 0\r\n \r\n assert re.search(re.compile(r\"DVC version: \\d+\\.\\d+\\.\\d+\"), caplog.text)\r\n assert re.search(re.compile(r\"Python version: \\d\\.\\d\\.\\d\"), caplog.text)\r\n assert re.search(re.compile(r\"Platform: .*\"), caplog.text)\r\n assert re.search(re.compile(r\"Binary: (True|False)\"), caplog.text)\r\n > assert re.search(\r\n re.compile(r\"Filesystem type \\(cache directory\\): .*\"), caplog.text\r\n )\r\n E AssertionError: assert None\r\n E + where None = (re.compile('Filesystem type \\\\(cache directory\\\\): .*'), 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n')\r\n E + where = re.search\r\n E + and re.compile('Filesystem type \\\\(cache directory\\\\): .*') = ('Filesystem type \\\\(cache directory\\\\): .*')\r\n E + where = re.compile\r\n E + and 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n' = <_pytest.logging.LogCaptureFixture object at 0x1258c6210>.text\r\n\r\n [....]/dvc/tests/func/test_version.py:13: AssertionError\r\n\r\n\r\n\r\n2)\r\n\r\n\r\n repo_dir = , caplog = <_pytest.logging.LogCaptureFixture object at 0x1265785d0>\r\n\r\n def test_info_outside_of_repo(repo_dir, caplog):\r\n assert main([\"version\"]) == 0\r\n \r\n assert re.search(re.compile(r\"DVC version: \\d+\\.\\d+\\.\\d+\"), caplog.text)\r\n assert re.search(re.compile(r\"Python version: \\d\\.\\d\\.\\d\"), caplog.text)\r\n assert re.search(re.compile(r\"Platform: .*\"), caplog.text)\r\n assert re.search(re.compile(r\"Binary: (True|False)\"), caplog.text)\r\n > assert re.search(\r\n re.compile(r\"Filesystem type \\(workspace\\): .*\"), caplog.text\r\n )\r\n E AssertionError: assert None\r\n E + where None = (re.compile('Filesystem type \\\\(workspace\\\\): .*'), 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n')\r\n E + where = re.search\r\n E + and re.compile('Filesystem type \\\\(workspace\\\\): .*') = ('Filesystem type \\\\(workspace\\\\): .*')\r\n E + where = re.compile\r\n E + and 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n' = <_pytest.logging.LogCaptureFixture object at 0x1265785d0>.text\r\n\r\n [.......]/dvc/tests/func/test_version.py:31: AssertionError\r\n\n@GildedHonour Those tests were fixed recently on master, please update your branch.\nContext https://discordapp.com/channels/485586884165107732/485596304961962003/565909315945365544\nWill this the correct output\r\n\r\n```\r\n$ dvc diff f722af7 91cdc34\r\n\r\ndvc diff from f722af74ec372073d04847a3c77ff7e7a154a21b to 91cdc345625ded08cb50f5616f41cee73b198bb6\r\n\r\ndiff for 'test'\r\n-test with md5 cd5a9abdb72acc541fecb818c8280d5c.dir\r\n+test with md5 3d681d1fe5b39802f663c9a82600d219.dir\r\n\r\n0 files not changed, 1 files modified, 0 files added, 0 files deleted, size was increased by 3 Bytes\r\n\r\n```\r\n\r\n?\r\n\r\nNamely, `1 files modified` is the only difference from what it shows currently. \r\n\r\nAnd `changed`? Are \"modified\" and \"changed\" different in this context?\n@GildedHonour \"0 files _not_ changed\". Yes, I think this is the only difference. We need to fix that. Feel free to fix `not changed` part so it's less confusing. We will need to update the docs if needed and write a test for this.\n@shcheklein Okay\r\n\r\n`1 files changed, 1 files modified, 0 files added, 0 files deleted, size was increased by 3 Bytes`\r\n\r\n \n@GildedHonour so, let's imagine we have 10 files in the directory and we change only one of them:\r\n\r\n`9 files _not_ changed, 1 files modified, 0 files added, 0 files deleted, size was increased by 3 Bytes`\r\n\r\nThis is the intended output in this case ^^\r\n\r\nSince, I see that the phrase `9 files _not_ changed` is confusing, may be we can change the it a little bit (preserving the semantics of course). \nAlright. I've fixed it I think. \r\n\r\nI'm working on the tests.\nthere're 2 tests in `func/test_version.py` will fail, they're probably unrelevant to my changes. They may have to do wit my OS -- MacOS. Should I fix them?\r\n\r\n\r\n1)\r\n\r\n dvc_repo = Repo: '/private/var/folders/qr/0v5z71xn7x503ykyv1j6lkp00000gn/T/dvc-test.28819.vk4jnw5_.DAdbZ4bwgScCFRGEbwNNfJ'\r\n caplog = <_pytest.logging.LogCaptureFixture object at 0x1258c6210>\r\n\r\n def test_info_in_repo(dvc_repo, caplog):\r\n assert main([\"version\"]) == 0\r\n \r\n assert re.search(re.compile(r\"DVC version: \\d+\\.\\d+\\.\\d+\"), caplog.text)\r\n assert re.search(re.compile(r\"Python version: \\d\\.\\d\\.\\d\"), caplog.text)\r\n assert re.search(re.compile(r\"Platform: .*\"), caplog.text)\r\n assert re.search(re.compile(r\"Binary: (True|False)\"), caplog.text)\r\n > assert re.search(\r\n re.compile(r\"Filesystem type \\(cache directory\\): .*\"), caplog.text\r\n )\r\n E AssertionError: assert None\r\n E + where None = (re.compile('Filesystem type \\\\(cache directory\\\\): .*'), 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n')\r\n E + where = re.search\r\n E + and re.compile('Filesystem type \\\\(cache directory\\\\): .*') = ('Filesystem type \\\\(cache directory\\\\): .*')\r\n E + where = re.compile\r\n E + and 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n' = <_pytest.logging.LogCaptureFixture object at 0x1258c6210>.text\r\n\r\n [....]/dvc/tests/func/test_version.py:13: AssertionError\r\n\r\n\r\n\r\n2)\r\n\r\n\r\n repo_dir = , caplog = <_pytest.logging.LogCaptureFixture object at 0x1265785d0>\r\n\r\n def test_info_outside_of_repo(repo_dir, caplog):\r\n assert main([\"version\"]) == 0\r\n \r\n assert re.search(re.compile(r\"DVC version: \\d+\\.\\d+\\.\\d+\"), caplog.text)\r\n assert re.search(re.compile(r\"Python version: \\d\\.\\d\\.\\d\"), caplog.text)\r\n assert re.search(re.compile(r\"Platform: .*\"), caplog.text)\r\n assert re.search(re.compile(r\"Binary: (True|False)\"), caplog.text)\r\n > assert re.search(\r\n re.compile(r\"Filesystem type \\(workspace\\): .*\"), caplog.text\r\n )\r\n E AssertionError: assert None\r\n E + where None = (re.compile('Filesystem type \\\\(workspace\\\\): .*'), 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n')\r\n E + where = re.search\r\n E + and re.compile('Filesystem type \\\\(workspace\\\\): .*') = ('Filesystem type \\\\(workspace\\\\): .*')\r\n E + where = re.compile\r\n E + and 'INFO dvc.command.version:version.py:65 DVC version: 0.53.1+60159b.mod\\n ... Platform: Darwin-17.7.0-x86_64-i386-64bit\\n Binary: False\\n' = <_pytest.logging.LogCaptureFixture object at 0x1265785d0>.text\r\n\r\n [.......]/dvc/tests/func/test_version.py:31: AssertionError\r\n\n@GildedHonour Those tests were fixed recently on master, please update your branch.":1,"It seems like write mode should just not be supported at all here. If you are writing to a file associated with a specific git revision, wouldn't this require rewriting git history?\r\n\r\nActually, is write mode even something that should be supported in `api.open` at all (with or without rev)?\nIf anything this sounds more like a `dvcx` scenario where a write actually requires\r\n- modify the file\r\n- `dvc commit` the changes if it's a DVC tracked file\r\n- `git add + git commit` the changes to relevant files\nYeah, it shouldn't be supported. Going through too many issues 😄 . It would be nice to have a better error message and maybe document when write mode isn't supported.":1,"Copying main part of the discussion about this from Slack:\r\n\r\n> @Suor: When you you do `dvc import -r ...` on an existing import stage it rewrites revisions thus **switching** a tag or a branch.\r\n\r\n> Dmitry: ...we need a shortcut for re-importing/`import`, and `update` looks like a reasonable alternative...\r\n\r\n> Alexander: You mean you want avoid retyping the url? \r\n\r\n> Dmitry: Yes. Also, `update` seems a proper command name for updating version.\r\nI understand that switching branches is kind of exception, but this is not what I usually do with imported datasets.\r\n\nUpdating vs. re-importing is definitely a source of confusion, and it's reflected in our docs (which also requires the term \"fixed-revision import\". See the following excerpts:\r\n\r\nFrom https://dvc.org/doc/command-reference/import#example-fixed-revisions-re-importing:\r\n\r\n> If the Git revision moves (e.g. a branch), you may use dvc update to bring the data up to date. However, for typically static references (e.g. tags), or for SHA commits, in order to actually \"update\" an import, it's necessary to re-import the data instead, by using dvc import again without or with a different --rev. This will overwrite the import stage...\r\n\r\nFrom https://dvc.org/doc/command-reference/update#examples:\r\n\r\n> For typically static references (e.g. tags), or for SHA commits, dvc update will not have any effect on the import. Refer to the re-importing example to learn how to \"update\" fixed-revision imports.\r\n\r\nFrom https://dvc.org/doc/use-cases/data-registry#example (in an expandable section):\r\n\r\n> In order to actually \"update\" it, do not use dvc update. Instead, re-import the data\nSo I like the idea about `dvc update --rev` because it will probably simplify all these explanations, although it will also require changing its command reference to explain that there are 2 types of updates supported:\r\n\r\n- Simply look for changes in the import as defined in its DVC-file, respecting `url` AND `rev` (if present) – only updating the actual data and `rev_lock` field.\r\n- Change the `rev` AND look for changes, updating data and `rev_lock` as well.\r\n\r\nAlternatively we could introduce a new command or subcommand such as `dvc import move` to change an import stage's `rev` value, in order to then `dvc update` it.\nHey, I'll give it a try to create a solution for this feature!\n@dmpetrov hey, what is the expected behavior after `dvc update --rev another-rev`, should it lock original import to `another-rev` or do not create side effects like that?\r\n\r\ncurrent behaviour is, it locks to `another-rev` but also pulls the rev each time from the remote which I think it should just cache if the last commits are the same?\n@ilgooz `dvc update` and `dvc update --rev latest_rev` should do the same, so yes, it should lock to `another-rev`, because that is how `dvc update` currently works too.\r\n\r\nDo you mean that it is pulling the `rev` on each `update`? If so, it is how our current caching is implemented. There is no need to tackle that in this PR, feel free to create an issue for it though :slightly_smiling_face: \n> @ilgooz `dvc update` and `dvc update --rev latest_rev` should do the same, so yes, it should lock to `another-rev`, because that is how `dvc update` currently works too.\r\n> \r\n> Do you mean that it is pulling the `rev` on each `update`? If so, it is how our current caching is implemented. There is no need to tackle that in this PR, feel free to create an issue for it though 🙂\r\n\r\nThanks, yes, I asked two different Qs and got my answers!\n@efiop, why is this p0 btw?":1,"Hi @mhham !\r\n\r\nThanks for reporting this issue! The original intension was to just not make it fatal if some download fails, but that approach is clearly faulty. We need to download everything we can and then error-out, so `dvc pull` doesn't report \"success\". \n- [ ] refactor download/upload methods to unify them\r\n- [ ] raise an error if download/upload failed, but download/upload what we can":1,"For the record: `--run-cache` flag is just a temporary solution and is not meant to accept targets. We will likely just support `dvc pull target` that will then somehow look into the run-cache by itself and pull by itself or suggest a hint on how to do it. run-cache is really an implementation detail that should be hidden away. We need to take a closer look at this.\nOh, ok. Is there any kind of estimative on this being prioritized? \r\n\r\nAs described in the forum, I was planning to use `--run-cache` as a workaround for deploying models, but the lack of targets selection makes it impossible.\nHi @maricatovictor ! Sorry for the delay. We've added this task to the next sprint (starting next week).":1,"PR welcome to relax the check. ":1,"Hi @vitalwarley , thanks for the detailed report. I can reproduce it.\r\nTaking a look":1,"Hi @PeterFogh !\r\n\r\nThanks for reporting it! That part of the python API is not officially released yet, so there definitely will be some bugs 🙁 Are you using it in one of your scripts? Could you describe the scenario? E.g. how big is the graph and what `networkx` version are you using?\nYou are welcome. Yaah. I know, I'm pushing DVC to the experimental level 😜.\r\nYour scenario is to save the DVC pipeline graph as a PNG image file - which we store in MLflow as an artefact. \r\n\r\nThe pipeline looks like this by `dvc pipeline show --ascii`:\r\n```\r\n+-------------------+ +---------------------+ +------------------------------+ +---------------------------+\r\n| sql_extration.dvc | | dawiki_download.dvc | | landbrugsinfo_extraction.dvc | **********| lkontoplan_extraction.dvc |\r\n+-------------------+ +---------------------+*** +------------------------------+* ****+---------------------------+\r\n * ******************** * ******** *\r\n * ********************* ****** * ******** *\r\n * ********************* *** * **** *\r\n +---------------+********** +-----------------------+ *\r\n | splitting.dvc |******* | pretrain_word2vec.dvc | *\r\n +---------------+ *************** +-----------------------+ *\r\n * **************** * *\r\n * *************** * *\r\n * ******** * *\r\n * +--------------------+ *\r\n * *******| train_word2vec.dvc | *\r\n * *************** +--------------------+ *\r\n * ************** * *\r\n * *************** * *\r\n * ******** * *\r\n+-------------------+ +--------------+ *** *\r\n| featurization.dvc |*** ****| training.dvc |** **** *\r\n+-------------------+ ********* ******** +--------------+ ****** ***** *\r\n * ********* * ******** *\r\n * ******** ********* * **** ****** *\r\n * ***** ***** * *** ****** *\r\n +----------------+ +-----------------------+ **** *****\r\n | prediction.dvc |****** | model_to_azure_sa.dvc | *** *********\r\n +----------------+ *********** +-----------------------+ ** *********\r\n *********** *** *********\r\n *********** *** *********\r\n *********** *******\r\n ****+---------+\r\n | Dvcfile |\r\n +---------+\r\n```\r\n\r\nnetworkx version is:\r\n```\r\nconda list -n py36_v11 | grep networkx\r\n> networkx 2.3 py_0\r\n```\n@PeterFogh if you don't need to do anything with the Repo object after that, or if you can initialize it again, try to run `reverse(copy=False)`.\r\n\r\nI wonder if it's networkx bug? Or something it's something related to us due to deepcopy calls.\nk, was able to reproduce it this way:\r\n\r\n```\r\nfrom dvc.path_info import URLInfo\r\nu = URLInfo(\"ssh://user@test.com:/test1/test2/test3\")\r\ncopy.deepcopy(u)\r\n```\r\n\r\nso, it something related to our UrlInfo implementation.":1,"> “exited with 2” Is it useful information? Where the exit code 2 belongs to? It might confuse users. Error code can be in debug errors not here.\r\n\r\nI disagree with this, exit codes are important, well that's how you know it's succeeded or failed (or crashed).\r\n\r\n> Do we really need [Errno 2]? In what cases the code helps users? This makes the message longer and breaks human readability.\r\n> $ dvc exp run\r\n> ERROR: failed to reproduce 'dvc.yaml': [Errno 2] No such file or directory: '/Users/dmitry/src/test/myproj/data'\r\n\r\nThis is unrelated to `dvc exp init` and out of scope to be honest for this. This is part of a larger issue with DVC and happens in all of the commands. When I brought this a year ago for https://github.com/iterative/dvc/issues/5387, there were disagreements on how to handle these errors (cc @efiop).\r\n\nFrom #7130:\r\n\r\n> `dvc exp init` is not fully supported without interactive mode.\r\nIt looks like today the only supported flow is — interactive. The default `dvc init` has multiple assumptions about the project structure and it is not clear how a user should know about the assumptions.\r\n\r\nFair point @dmpetrov. Making the output consistent between them can make non-interactive mode more like `dvc exp init -i`.\n```\r\n'src' does not exist in the workspace. \"exp run\" may fail.\r\n'data' does not exist in the workspace. \"exp run\" may fail.\r\n```\r\n\r\nI'm proposing creating these by default (plus `params.yaml`). Users need a single simple command to wrap their `python train.py` without manually creating all the structures.\nThere is a rule on https://clig.dev/#output - `Display output on success, but keep it brief.` It feels like these are not needed in the output if we follow the rule.\r\n\r\nTwo issues are here:\r\n\r\n1. Do we need the content of dvc.yaml in the output?\r\n```\r\ntrain:\r\n cmd: python train.py\r\n deps:\r\n - data\r\n```\r\n\r\n2. Do we need links in the output? (Especially as a single line)\r\n```\r\nSee https://s.dvc.org/g/pipeline-files.\r\n...\r\nSee https://s.dvc.org/g/exp/run.\r\n```\n> There is a rule on https://clig.dev/#output - `Display output on success, but keep it brief.` It feels like these are not needed in the output if we follow the rule.\r\n\r\nI think @skshetry would agree, which explains why there is so little output in non-interactive mode now. I suggested more verbose output since this command is tailored to users with no prior dvc knowledge.\r\n\r\n> 1. Do we need the content of dvc.yaml in the output?\r\n\r\nNo. It can be an intro to dvc stage syntax, but it's not necessary. We also don't need to show it or prompt for confirmation in `dvc exp init -i`.\r\n\r\n> Do we need links in the output? (Especially as a single line)\r\n\r\nNo. Again, I/we opted for more verbose output to guide users more. It's not output that is/needs to be machine readable, and I thought usability should trump style in this case, but obviously it can be removed.\r\n\r\n---\r\n\r\nGiven those suggestions, the basic output can be:\r\n\r\n```\r\n$ dvc exp init python train.py\r\nDVC assumes the following workspace structure:\r\n├── data\r\n├── metrics.json\r\n├── models\r\n├── params.yaml\r\n├── plots\r\n└── src\r\n\r\nCreated train stage in dvc.yaml. To run, use \"dvc exp run\".\r\n```\r\n\r\nShould we also make interactive mode more concise?\r\n\r\n```\r\n$ dvc exp init -i python train.py\r\nDVC assumes the following workspace structure:\r\n├── data\r\n├── metrics.json\r\n├── models\r\n├── params.yaml\r\n├── plots\r\n└── src\r\n\r\nPath to a code file/directory [src, n to omit]:\r\nPath to a data file/directory [data, n to omit]:\r\nPath to a model file/directory [models, n to omit]:\r\nPath to a parameters file [params.yaml, n to omit]:\r\nPath to a metrics file [metrics.json, n to omit]:\r\nPath to a plots file/directory [plots, n to omit]:\r\n\r\nCreated train stage in dvc.yaml. To run, use \"dvc exp run\".\r\n```\nOne thought on this: having quasi-unix style makes sense for dvc. In this case, I'm not so sure since the intended audience is less likely to be people familiar with that style.":1,"@efiop , `destroy` should work as `rm -rf .dvc`?\r\n\r\nI was thinking about adding the `--all` option that will work as `rm -rf .dvc *.dvc Dvcfile`.\r\n\r\nIs that the expected behavior?\nCurrently `destroy` removes both .dvc/ directory and *.dvc files with their outputs. Starting from 1.0, it should leave outputs intact(in symlink case, it should remove symlinks and replace them by copies), so that user at least has his data back.\nWe should use `unprotect` as described in https://github.com/iterative/dvc/issues/1802":1,"I think this is an upstream bug - https://github.com/iterative/dvc/issues/7531.\n\nWhat error are you getting? Are you using `setup-cml`? In which case you should also use `setup-dvc`.\n\nOr are you using the CML Docker images?\n> commit hides experiment results and I read that CML is not intended for experimentation\n\nSorry I don't quite follow. How do commits hide results? CML is intended for provisioning & reporting experiments.\n> > commit hides experiment results and I read that CML is not intended for experimentation\r\n> \r\n> Sorry I don't quite follow. How do commits hide results? CML is intended for provisioning & reporting experiments.\r\n\r\nWhen I say experiments I refer to using `dvc exp`. Once you commit your changes `dvc exp show` no longer shows experiments table.\r\n\r\nIn my specific case I wanted to try the following:\r\n\r\n```yaml\r\nname: experiments\r\non: [push]\r\njobs:\r\n train-model:\r\n runs-on: ubuntu-latest\r\n steps:\r\n - uses: actions/checkout@v2\r\n - uses: iterative/setup-cml@v1\r\n - uses: actions/setup-python@v2\r\n with:\r\n python-version: '3.x'\r\n - name: Train model\r\n env:\r\n repo_token: ${{ secrets.GITHUB_TOKEN }}\r\n run: |\r\n pip3 install -r requirements.txt\r\n #bash exp_file.sh\r\n dvc exp run -S train.C=0.005\r\n dvc exp run -S train.C=100\r\n\r\n echo \"## Resultados del Experimento\" >> report.md\r\n dvc exp show --only-changed --drop 'assets|src' --no-pager --md >> report.md\r\n \r\n echo \"## Parallel Plot\\n\" >> report.md\r\n dvc exp show --only-changed --drop 'assets|src' --pcp --sort-by test_recall >> report.md\r\n\r\n cml send-comment report.md\r\n```\r\n\r\nIn this particular case I wanted to report the results of 2 experiments with `dvc exp run`. I've tried also using a bash file (that you can see commented out) with the following: \r\n\r\n```bash\r\ndvc exp run --queue -S train.C=5\r\ndvc exp run --queue -S train.C=30\r\ndvc exp run --queue -S train.C=60\r\ndvc exp run --queue -S train.C=120\r\n\r\ndvc exp run --run-all\r\n```\r\n\r\nAll of the experiments resulted in something like:\r\n\r\n\r\n\r\nSo my question would be: Is it allowed to run something like what I'm proposing?\r\nCan I run my experiments and report it in the PR?\r\n\r\nI can't remember when I read that Experimentation was meant to be done locally and only `dvc repro` on the CI Pipeline. Can you clarify that please?\r\n\r\nThanks in advance,\r\n\r\nAlfonso\nMy brain has stopped working for the day already, but I don't think there isn't any reason you shouldn't be able to do this. Without having tested anything like this I would blindly expand your checkout step to see if that fixes it:\r\n```yml\r\n- uses: actions/checkout@v3\r\n with:\r\n fetch-depth: 0\r\n```\r\nhttps://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches\n(Transferred to DVC because it looks like a config/setup issue unrelated to CML)\n@dacbd's suggestion should be correct, github's checkout action only fetches a single shallow commit by default, this isn't enough of the Git repo for `exp run` to work properly.\n@pmrowla Why does `exp run` require more than the baseline commit to be fetched?\n> @pmrowla Why does `exp run` require more than the baseline commit to be fetched?\r\n\r\nI understand you say `dvc exp run` depends on the rest of git history, probably because `dvc exp show` displays info of master metrics too. But if this is my first run of experiments `dvc exp run` should not depend on data of a different commit to work...\r\n\r\nAnyways, I'll be testing this small change during the day and I'll get back to you... \r\nThanks,\r\n\r\nAlfonso\n> @pmrowla Why does `exp run` require more than the baseline commit to be fetched?\r\n\r\nThe issue is that we use `git merge` in experiments and doing a `merge-base` operation in git requires fetch depth > 1 (the specific required depth depends on the commits being merged).\r\n\r\nBasically, doing the merge-base requires finding a common ancestor for the commits being merged (that is not any of the merge commits themselves). For our purposes w/DVC experiments, this means that a fetch depth of 2 will usually be sufficient (so baseline commit + 1 parent), but that won't be the case 100% of the time. So if users are trying to use `exp run` inside github actions, the general solution is to use `fetch-depth: 0` (and not use a shallow clone at all).\r\n\r\n@dberenbaum \nThanks @pmrowla. I guess even if we tried to minimize operations where merge is needed, it will still be needed sometimes, and it's probably better to document the proposed workaround above. Opened https://github.com/iterative/dvc.org/issues/3416.\nAh right so the CML solution would be [`cml ci --unshallow`](https://cml.dev/doc/ref/ci) (a bit better than `fetch-depth: 0`)\nIf we go with the suggestion in https://github.com/iterative/dvc.org/issues/3416#issuecomment-1089866190, we should keep this open to update the message in DVC to be more informative and helpful. Even if DVC can't tell whether it's in a CI context, it could at least suggest to fetch missing commits and maybe link to docs that could go into more depth about specific use cases like cml.\nOn the UI side, we could detect the presence of `CI`/`GITHUB_ACTIONS`/`GITLAB_CI` environment variables. \nIf we get the invalid commit exception we can just do the extra check to see whether or not we are in a shallow repo (you just have to check whether or not `.git/shallow` exists). This problem isn't specific to CI environments, it's just more likely to show up there since github uses shallow clones in CI by default.\nRight, I guess the question is whether the message should be general like \"don't use a shallow clone\" or more CI-specific like \"try fetch-depth: 0\"? I think probably the former is better even if we can detect CI, since we don't want to have to cover the syntax of different git server behaviors, although we could link to docs where that level of detail could be provided.\n+1 for a general message w/ link to docs for more specific details/solutions.\n> Right, I guess the question is whether the message should be general like \"don't use a shallow clone\" or more CI-specific like \"try fetch-depth: 0\"? I think probably the former is better even if we can detect CI, since we don't want to have to cover the syntax of different git server behaviors, although we could link to docs where that level of detail could be provided.\r\n\r\nI'd prefer general message with a CI specific hint and link to the docs wherever possible. I'd prefer less redirection as much as possible.\r\n\r\nExample:\r\n```\r\ndvc exp run\r\nERROR: Cannot run in a shallow-cloned repository\r\n\r\nIf you are using `actions/checkout`, please set `fetch-depth: 0` so that the repo is not shallow-cloned.\r\nSee https://dvc.org/doc/user-guide/troubleshooting#shallow-clone.\r\n```\r\n\nDear all, \r\nThanks for all of your answers. I think the spirit of good open source is havomng everyone really involved, and I really appreciate your help on trying to solve this issue. \r\n\r\nI implemented the steps mentioned above and it worked partially. Once I run the experiments it turns out git is not recognized in the Github Machine:\r\n\r\n\r\n\r\nIn order to solve this issue I found a really nice action here: `fregante/setup-git-user@v1`. This helps the remote machine make the connection with git in order to make `dvc run exp` to work.\r\n\r\nThe final workflow will be like this:\r\n\r\n```yaml\r\nname: experiments\r\non: [push]\r\njobs:\r\n train-model:\r\n runs-on: ubuntu-latest\r\n steps:\r\n - uses: actions/checkout@v3\r\n with: \r\n fetch-depth: 0\r\n - uses: fregante/setup-git-user@v1\r\n - uses: iterative/setup-cml@v1\r\n - uses: iterative/setup-dvc@v1\r\n - uses: actions/setup-python@v2\r\n with:\r\n python-version: '3.x'\r\n - name: Experiment\r\n env:\r\n repo_token: ${{ secrets.GITHUB_TOKEN }}\r\n run: |\r\n pip3 install -r requirements.txt\r\n #bash exp_file.sh\r\n dvc exp run -S train.C=0.005\r\n dvc exp run -S train.C=100\r\n\r\n echo \"## Resultados del Experimento\" >> report.md\r\n dvc exp show --only-changed --drop 'assets|src' --no-pager --md >> report.md\r\n\r\n cml send-comment report.md\r\n```\r\n\r\nI think this could be mentioned as a user-case in the documentation because is a very common experimentation workflow, and if we can externalize experimentation to a Github machine or a Cloud Runner would be very good.\r\n\r\nOn another note, I noticed `iterative/setup-dvc@v1` doesn't include yaml package which is a dependency on DVC. So you have to make sure to add it to the requirements.txt otherwise DVC will complain. Of course, unless you think it's a good idea to add it in the action.\r\n\r\nThanks and hope this helps DVC,\r\n\r\nAlfonso\n@datacubeR, thanks for the feedback; since you are already using `cml`, you can take a [look at running](https://cml.dev/doc/ref/ci) `cml ci`, which would solve the git user problem. \r\n\r\n> and if we can externalize experimentation to a Github machine or a Cloud Runner would be very good.\r\n\r\nThis is part of what [`cml runner`](https://cml.dev/doc/ref/runner) command can help you with, running training workflows on cloud-hosted machines like ec2. If you decide to give it a try and run into any issues or have any other feedback be sure to let us know.\nBumping the priority of this since it is necessary for integration with cml.\r\n\r\n> ```\r\n> If you are using `actions/checkout`, please set `fetch-depth: 0` so that the repo is not shallow-cloned.\r\n> ```\r\n\r\nIs this sufficiently general? It's only applicable to GH actions AFAIK. Each git server has its own depth settings and variables, not to mention people who manually do shallow clones.\r\n\r\n> Ah right so the CML solution would be [`cml ci`](https://cml.dev/doc/ref/ci) (a bit better than `fetch-depth: 0`)\r\n\r\nAlso, this is probably a better suggestion, but only if cml is installed.\r\n\r\nSo maybe we can generalize the message and provide specific examples like `fetch-depth: 0` in the docs. I agree with the general point of @skshetry, but I don't see a way to specifically address every possible scenario in the error message.\nIf you allow me to chime in, from the user perspective I think use cases are way clearer than just random notes.\r\n\r\nFor instance, I understand these fixes are only applicable to GitHub Actions, but in my opinion there is no clear documentation on CML CI which I think won't be normally installed since docker containers or virtual machines are normally the most common way to deal with this part. \r\n\r\n\r\n\nShould note that `cml ci` does not actually unshallow the repo (but will after https://github.com/iterative/cml/pull/957). The correct fix for running `dvc exp run` inside github actions is to set `fetch-depth: 0` in the checkout action.\nKeeping this open on the DVC side until we address clarifying the shallow repo error in DVC UI and/or docs\nYup probably just adding \"`did you forget to unshallow? https://error.dvc.org/unknown-object`\" or similar to DVC's error message would be gewd.\n`dvc exp run` succeeded in the workspace (but not in a temp dir) on a shallow clone until https://github.com/iterative/dvc/commit/fa819b0b70ba5f0f7ed7010280dbe840a813c1d3:\r\n\r\n```\r\n$ dvc -V\r\n2.9.3.dev8+g37f8010b4\r\n$ git clone --depth=1 git@github.com:iterative/example-get-started.git\r\nCloning into 'example-get-started'...\r\nremote: Enumerating objects: 35, done.\r\nremote: Counting objects: 100% (35/35), done.\r\nremote: Compressing objects: 100% (25/25), done.\r\nremote: Total 35 (delta 6), reused 24 (delta 4), pack-reused 0\r\nReceiving objects: 100% (35/35), 35.62 KiB | 17.81 MiB/s, done.\r\nResolving deltas: 100% (6/6), done.\r\n$ cd example-get-started\r\n$ dvc pull\r\nA data/prepared/\r\nA data/data.xml\r\nA data/features/\r\nA model.pkl\r\n4 files added and 6 files fetched\r\n$ dvc exp run\r\n'data/data.xml.dvc' didn't change, skipping\r\nStage 'prepare' didn't change, skipping\r\nStage 'featurize' didn't change, skipping\r\nStage 'train' didn't change, skipping\r\nStage 'evaluate' didn't change, skipping\r\n$ dvc -V # Upgrade DVC version\r\n2.9.3.dev9+gfa819b0b7\r\n(dvc) dave@davids-air:/tmp/example-get-started 13:15:15\r\n$ dvc exp run\r\nERROR: Merge failed\r\n```\r\n\r\n@pmrowla It makes sense as part of making the workspace and temp implementations more consistent, but is there any way to make at least workspace runs succeed in this scenario? It breaks a previously supported workflow for anyone using CML or other CI actions with `exp run`.\r\n\r\n> The issue is that we use `git merge` in experiments and doing a `merge-base` operation in git requires fetch depth > 1 (the specific required depth depends on the commits being merged).\r\n> \r\n> Basically, doing the merge-base requires finding a common ancestor for the commits being merged (that is not any of the merge commits themselves). For our purposes w/DVC experiments, this means that a fetch depth of 2 will usually be sufficient (so baseline commit + 1 parent), but that won't be the case 100% of the time. So if users are trying to use `exp run` inside github actions, the general solution is to use `fetch-depth: 0` (and not use a shallow clone at all).\r\n\r\nIs a merge necessary to run an experiment? I thought behavior for running experiments was similar to git stash apply, which works fine in this scenario.\n> It makes sense as part of making the workspace and temp implementations more consistent, but is there any way to make at least workspace runs succeed in this scenario?\r\n\r\nPrior to that change, workspace and temp implementations were essentially two completely different things, which made testing and maintaining both difficult, and led to them having different behavior in a lot of scenarios. I don't think it is worth the development effort required to maintain two separate `exp run` implementations vs requiring that users unshallow repos in CI for both the workspace and tempdir cases.\r\n\r\n> Is a merge necessary to run an experiment? I thought behavior for running experiments was similar to git stash apply, which works fine in this scenario.\r\n\r\nIt works \"similar to\" stash apply, not exactly like `git stash apply`. We have to do a merge because libgit2/pygit2 and dulwich do not have implementations for `stash apply`-ing arbitrary merge commits. In order for us to get the similar behavior, we have to just use regular `merge` to apply the merge commit.":1,"Looks like a minor bug in `dvc metrics show -T`. `master` should not be included. \r\n\r\nThere is a step that creates `bigram-experiment`. @ricardoserradas, please check the `compare-experiments.md` once again:\r\n\r\n```\r\ngit commit -a -m \"evaluate bigram model\"\r\ngit tag -a \"bigram-experiment\" -m \"bigrams\"\r\n```\r\n\r\nI would rename `Working Tree` to just `working tree` along the way. It's not a title or something.\nAlso need to adjust the docs.":1,"Thanks @JensHeinrich for reporting this issue.\r\n\r\nI can confirm the issue. `partial()` returns an instance, not a class or function.\r\n\r\nit may fix by accessing the function in the following line. I mean replacing `f_cls.__func__.__qualname__` with `f_cls.__func__.func.__qualname__` in case of `partial`\r\n\r\nhttps://github.com/pydantic/pydantic/blob/73373c3e08fe5fe23e4b05f549ea34e0da6a16b7/pydantic/_internal/_decorators.py#L204\r\n\r\nWould you like to open a PR?\nI am already working on a PR, but at the moment I just add a better error\nEven if the `ref` is created in a better way (or the check just skipped by using `allow_reuse=True`) another `AttributeError` is raised [here](https://github.com/pydantic/pydantic/blob/10b8ec7dde62f5e4948a09b9114c5ac64d786ded/pydantic/class_validators.py#L170)\nAlso signature creation doesn't work on it\n> Even if the `ref` is created in a better way (or the check just skipped by using `allow_reuse=True`) another `AttributeError` is raised [here](https://github.com/pydantic/pydantic/blob/10b8ec7dde62f5e4948a09b9114c5ac64d786ded/pydantic/class_validators.py#L170)\r\n\r\nThis one also can be fixed by the same change that I mentioned before.\r\n\r\n> I am already working on a PR, but at the moment I just add a better error\r\n\r\nI think we can make it work at least on `1.10.x` but I am not sure about `V2`.\r\n\r\n@samuelcolvin Do you think we should prevent using `functools.partial` as a validator?\r\n\nTBH I feel `functools` is broken here and we are just adding a workaround.\r\nEven a `lambda` gets an `__qualname__`\n> TBH I feel `functools` is broken here and we are just adding a workaround. Even a `lambda` gets an `__qualname__`\r\n\r\nagreed. Feel free to create an issue on cpython and copy me into it, I'd be interest to see what they say.\r\n\r\nAlso, can you create a PR against main to see if this is working there?\nThis one can be related https://bugs.python.org/issue34475\nI created an issue python/cpython#102323\nI personally find the responses in the links from the last two comments reasonable; it seems we should just not assume that `__qualname__` definitely exists.\nI'm good with using a default value instead, too.\nI am working on a PR for v1.10 already\nI would only allow those with `reuse=True`. Would you support that @samuelcolvin @dmontagu ?":1,"Hi @sjawhar, can you also provide the output for\r\n```\r\n$ git ls-files -s\r\n```\nSure.\r\n**Before**\r\n```\r\n100755 85e4c8da7c5aec98510056690191ded2439cb395 0\tdiff-report.sh\r\n100644 33ce410113315d54b9f73d3547f9e45283f892b4 0\tdocker-compose.util.yml\r\n100644 bc5f37c9bcab635058c8de36b5c3af767aab6050 0\tdocker-compose.yml\r\n100644 4cae2608a62fa342a1ad8846f52f855b4bf8765e 0\tdvc.lock\r\n100644 56ca72b4861b0e57f53e7edf094428b0fec98ddc 0\tdvc.yaml\r\n100644 6a5314dbf04978a1fda7766b4141d8550314c17e 0\tmodel/.gitignore\r\n100644 4ca34fd812d714bc6254cca291746c3be68fcde1 0\tmodel/metrics.json\r\n100644 9538ca8436b1460b107a6a3fe2623a317667afae 0\tnotebooks/.gitignore\r\n100644 fdd0376af280a5d3b2e308d857efa645c396d510 0\tnotebooks/cross-validation.ipynb\r\n100644 ad75ce5d00fc8328d821e24ee46e61c493d138e3 0\tparams.yaml\r\n100755 28930d85c9805f67f46e2c4ab7b46d810742a9b1 0\trun-experiment.sh\r\n```\r\n\r\n**After**\r\n```\r\n100755 85e4c8da7c5aec98510056690191ded2439cb395 0 diff-report.sh\r\n100644 33ce410113315d54b9f73d3547f9e45283f892b4 0 docker-compose.util.yml\r\n100644 bc5f37c9bcab635058c8de36b5c3af767aab6050 0 docker-compose.yml\r\n100644 4cae2608a62fa342a1ad8846f52f855b4bf8765e 0 dvc.lock\r\n100644 56ca72b4861b0e57f53e7edf094428b0fec98ddc 0 dvc.yaml\r\n100644 6a5314dbf04978a1fda7766b4141d8550314c17e 0 model/.gitignore\r\n100644 4ca34fd812d714bc6254cca291746c3be68fcde1 0 model/metrics.json\r\n100644 9538ca8436b1460b107a6a3fe2623a317667afae 0 notebooks/.gitignore\r\n100644 fdd0376af280a5d3b2e308d857efa645c396d510 0 notebooks/cross-validation.ipynb\r\n100644 ad75ce5d00fc8328d821e24ee46e61c493d138e3 0 params.yaml\r\n100755 28930d85c9805f67f46e2c4ab7b46d810742a9b1 0 run-experiment.sh\r\n```\r\n\r\nNo change. Running `git status` returns\r\n```\r\nChanges not staged for commit:\r\n (use \"git add ...\" to update what will be committed)\r\n (use \"git checkout -- ...\" to discard changes in working directory)\r\n\r\n modified: diff-report.sh\r\n modified: dvc.lock\r\n modified: model/metrics.json\r\n modified: params.yaml\r\n modified: run-experiment.sh\r\n```\r\n\r\nThen `git add .` followed by `git ls-files -s`:\r\n```\r\n100644 85e4c8da7c5aec98510056690191ded2439cb395 0 diff-report.sh\r\n100644 33ce410113315d54b9f73d3547f9e45283f892b4 0 docker-compose.util.yml\r\n100644 bc5f37c9bcab635058c8de36b5c3af767aab6050 0 docker-compose.yml\r\n100644 bc9c0dd6db6ca8aba5d1a91d075eb30ab1708652 0 dvc.lock\r\n100644 56ca72b4861b0e57f53e7edf094428b0fec98ddc 0 dvc.yaml\r\n100644 6a5314dbf04978a1fda7766b4141d8550314c17e 0 model/.gitignore\r\n100644 09a4057a575051bfd74afdfa53b31579634382a7 0 model/metrics.json\r\n100644 9538ca8436b1460b107a6a3fe2623a317667afae 0 notebooks/.gitignore\r\n100644 fdd0376af280a5d3b2e308d857efa645c396d510 0 notebooks/cross-validation.ipynb\r\n100644 b0f49802c2271fc8bbeb613999804f5333db408d 0 params.yaml\r\n100644 7b80292a13806ab5b3e350619664212a6bb8fcdb 0 run-experiment.sh\r\n```\nThanks.\r\n\r\nI think the issue probably happens because we use remote tree upload to populate the executor tempdir for experiments. Normally we force certain file permissions for DVC remotes, but in this case we should not be doing that for git-tracked files in experiments.":1,"I'm looking into this, but I'm afraid the solution isn't trivial.\r\n\r\nWeird that this got 11 :+1: and 2 :eyes: in 2 hours. Any idea why this happened?":1,"For the record: we can either `chdir()` into the temporary repo root or to make a global variable that we can adjust that will make `PathInfo.str()` use it for `relpath` (Kudos @Suor).\nThis is not only about `dvc get`. Import are also affected, see #2691\nAn addition about global variable, which might be used as base for `PathInfo.__str__()`, it should be:\r\n- really a thread local, not a simple variable\r\n- not accessed nor changed outside `dvc/path_info.py` directly\r\n- managed with a context manager:\r\n```python\r\nwith path_info_base(some_dir):\r\n # ... path_infos are stringified differently here\r\n```\r\n\r\nThis will protect us from usual global var issues making it a dynamic scope variable if you know what I mean ;)\nFrom discord:\r\n\r\n---\r\n@kurianbenoy:\r\nI am interested to fix that issue, even if it takes more time to understand the codebase\r\n \r\n@efiop:\r\nGlad to hear that! :slight_smile: Got it. Okay, let's think about some clever ways to fix that then.\r\nok, so we are using named cache for that. We could make it check if we are inside of a repo or not and if not then print a relpath computed relative to the repo.root_dir instead of cwd.\r\nthe piece of the code that is responsible for that is https://github.com/iterative/dvc/blob/0.66.4/dvc/output/base.py#L410\r\n\r\nspecifically `str(self)` that is passed as a name\r\nso if we could do something like:\r\n```python\r\nif os.getcwd().startswith(self.stage.repo.root_dir):\r\n name = str(self)\r\nelse:\r\n name = relpath(self.path_info, self.stage.repo.root_dir)\r\n```\r\nand then use that `name` instead of `str(self)` in that line, then it would automatically start working in an acceptable way.\r\n\r\n@Suor: Some outs might be outside repo dir, but still \"in repo\", referencing them simply by name would be confusing\nSo the core culprit is stringifying `PathInfo` objects, which don't know about repo and so can't show sane paths, stringifying output objects is, however, ok. So:\r\n- it's ok to use `str(self)` where @efiop mentioned\r\n- `OutputLocal.__str__()` should be fixed though\r\n- the code Ruslan showed above is almost right, the issue is that a dvc file might refer outside repo dir with a rel path\r\n\r\nI propose this logic for `OutputLocal.__str__()`:\r\n```python\r\nif not self.is_in_repo:\r\n return self.def_path\r\nelif :\r\n return relpath(self.path_info, curdir)\r\nelse:\r\n return relpath(self.path_info, self.repo.root_dir)\r\n``` \r\nWhich means we show relative paths for the repo we are in and rel to repo root paths for all other repos. Remotes and absolute paths are always shown as is.\r\n\r\nOn `` this not quire `.startswith()` as that is wrong for paths:\r\n```python\r\n\"a/b/c\" isin \"a/b\" == True\r\n\"a/bc\" isin \"a/b\" == False\r\n```\r\nThis would fix the issue and we won't luckily need chdirs nor a global var.\r\n\r\n**P.S.** As a second cleanup/refactor stage I would propose completely stop using `PathInfo.__str__()`, since it fundamentally doesn't know how to stringify itself. Raise `TypeError()` there and fix all the usages. This is definitely separate, don't think about it until the issue itself is resolved. ":1,"Update: after adding missing `z: float = field(init=False)` in the `Base` class the z attribute is properly preserved (does not get lost between the `__post_init__` and instance completion). But the first issue - `__post_init__` not being called in the first place still stands.":1,"It seems to me that `NoDvcRepoError` should be intercepted [here](https://github.com/iterative/dvc/blob/41351a2df2f36ed04846d5e3d976d6d99b71a151/dvc/external_repo.py#L46) and treated differently than \"normal\" NoDvcRepo\nNot able to reproduce this\r\n\r\n```\r\n(3.7.0-dvc) ➜ sfd dvc get https://github.com/iterative/dataset-registry I-dont-exist.zip \r\nERROR: failed to get 'I-dont-exist.zip' from 'https://github.com/iterative/dataset-registry' - unable to find DVC-file with output '../tmpuig76zzhdvc-repo/I-dont-exist.zip'\r\n \r\nHaving any troubles?. Hit us up at https://dvc.org/support, we are always happy to help! \r\n```\r\n\r\nThe relpath in the error msg is not really nice though.\nI can confirm this is no longer happening to me either 🤷♂ Updated title and description of issue.\nIts because `https://github.com/iterative/dataset-registry` became dvc repository 3 days ago.\r\n\r\ntry:\r\n```\r\ndvc get https://github.com/iterative/dvc.org \\ \r\n I-dont-exist.zip\r\n```\nThanks Pawel. I guess what happened is that https://github.com/iterative/dataset-registry used to be empty when I reported this. And since, I have actually populated it with an actual DVC repo. So this is a valid issue after all! I'll update the description and hide outdated comments.":1,"Try `m = Model(self_=“some URL”)` with the rest of the code as is (from the with-alias example).\n@dmontagu the problem is deserialization. \r\nI get a json body in a request with {\"self\": \"someurl\"} in it and I can't create a model instance without preparsing the body to replace \"self\" with \"self_\"\r\n\r\nIf pydantic had a way to \"preload\" like marshmallow does it might help?\nWould #624 help? \n@samuelcolvin would having a load alias give you a different function to call that didn’t already have `self` as a parameter? I don’t see that discussed in the linked issue.\r\n\r\nGiven how frequently the specific field name `self` seems to be desired (I think it has meaning in certain json schema specs), might it make sense to rename `self` to `__self__` or something else equally unlikely to cause conflicts in `BaseModel.__init__` (and perhaps other methods expecting field names as kwargs)? Unless the approach of calling `Model(**data)` to initialize a model becomes discouraged, it feels unfortunate to me to have to change the model initialization code just to support a reasonably-named field (reasonable in a JSON context, rather than a python context anyway).\n@samuelcolvin not sure whether splitting out load and dump aliases changes the fact.\r\n\r\nSeems to me being able to avoid `Model(**data)` to initialize a model avoids all sorts of possible issues with name clashes. Moving this to a 'marshmallow' style `load(...)` has other advantages for pre-formatting data etc. but I don't really want to suggest any specific approach here not knowing the history and roadmap of the project well enough, rather just if there is a way to handle this.\r\n\r\nRegardless, as @dmontagu points out, 'self' and even 'kwargs' should be possible to specify in a schema.":1,"> Not sure whether that check is as simple as checking existence of .dvc\r\n\r\nHm, probably not that, because git-ignored stuff under `.dvc` _should_ stick around even when you checkout a branch outside of dvc control. But maybe `git ls-files -- .dvc`?\nWith very minimal testing this post-checkout hook seems to fix at least my immediate problem:\r\n\r\n```\r\n#!/bin/sh\r\nLS_FILES=`git ls-files .dvc`\r\n[ \"$LS_FILES\" = \"\" ] || exec dvc checkout\r\n```\nSame thing happens on `git commit` in different branches. So `pre-commit` hook should also be conditional on this check. Maybe the `pre-push` hook too?\n@gthb dvc detects that this is a dvc repository by finding `.dvc` directory. When switching branches, you have some gitignored(in dvc branch) files there, so git leaves them under `.dvc`, and so dvc still detects your non-dvc branch as dvc branch. I don't see any good solution to handle that, except maybe modifying your git-hooks to only run on dvc branch. E.g. `.git/hooks/post-checkout`\r\n```\r\n#!/bin/sh \r\n \r\nif [ \"$(git rev-parse --abrev-ref HEAD)\" == \"my-dvc-branch\" ]; then \r\n exec dvc checkout \r\nfi\r\n```\n@gthb Oops, sorry, your later messages didn't show up for me for some reason. I like the `ls-files` trick a lot! Very neat! :slightly_smiling_face: Let's think if we could always include it as a header to our git hooks. I can only see a possible problem when you didn't git commit your .dvc files yet, but even that should not be a problem, since you usually git ocmmit that stuff right after `dvc init`. What do you think?\nActually `git ls-files` by default shows files that are in the index (added but not yet committed), and `dvc init` adds the new files to the index, so these hooks will work directly after `dvc init`.\r\n\r\n```\r\n$ dvc init\r\n[...]\r\n$ git ls-files .dvc\r\n.dvc/.gitignore\r\n.dvc/config\r\n$ git reset\r\n$ git ls-files .dvc\r\n$\r\n```\r\n\r\nBut yeah, instructions should probably point out that (with this `ls-files` change) the hooks installed by `dvc install` only act in a “dvc-enabled” branch, meaning one that has tracked files under `.dvc`, and initializing dvc on a branch doesn't affect other branches until the change gets merged to those branches. (So you can safely try it out in a branch before merging to master, for instance.)\n@gthb Would you like to contribute a patch for this? :slightly_smiling_face: You'd simply need to add that to https://github.com/iterative/dvc/blob/0.50.1/dvc/scm/git/__init__.py#L230 .\n@gthb Not sure if the message got lost or if I should take this as \"no\" :slightly_smiling_face: \nAh, whoops, sorry, you should take it as “away on vacation and not paying\nmuch attention” :) ... I can whip up a simple PR when I'm back home next\nweekend.\n\nOn Mon, Jul 22, 2019, 23:31 Ruslan Kuprieiev \nwrote:\n\n> @gthb Not sure if the message got lost or if I\n> should take this as \"no\" :)\n>\n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly, view it on GitHub\n> ,\n> or mute the thread\n> \n> .\n>\n\n@gthb We would really appreciate that :slightly_smiling_face: Have a great vacation!":1,"Thanks @chenrui333 for the report. This is broken due to https://github.com/iterative/dvc/pull/9760. Will fix shortly.":1,"Discord context: https://discordapp.com/channels/485586884165107732/485596304961962003/579053609271164929\nAlso when running `dvc run -o metrics.txt \"echo 0.9643 > metrics.txt\"` twice or if metrics.txt is already in cache.":1,"This is not really a bug in Pydantic. Pydantic generates valid JSON Schema.\r\n\r\nOpenAPI uses an old version of JSON Schema that only supports enums.\r\n\r\nBut you can change your model to use an enum instead: https://pydantic-docs.helpmanual.io/usage/types/#enums-and-choices\r\n\r\nIt achieves the same and will generate a JSON Schema with enums, that is valid with OpenAPI.\nShould we change pydantic so literal with multiple choices matches enum?\n@tiangolo I agree, my concern is more about the benefit of the Literal type as a one-liner choice on a Pydantic/FastAPI/Swagger UI context.\r\n\r\n@samuelcolvin If it breaks too many things, I would suggest a simple note in the documentation to avoid this unexpected behaviour (Literal with one element works well in fastapi context but not with multiple elements)\nPlease add a pr to improve the documentation.\r\n\r\nWe should change literals in V2.\n> Should we change pydantic so literal with multiple choices matches enum?\r\n\r\n@samuelcolvin actually that makes sense, a `Literal` generates a JSON Schema `const`, and it could only have a single value. So, yes, a multi-valued `Literal` *should* create a JSON Schema equivalent to an enum.\nokay, do you think the change represents a \"breaking change\" that needs to wait for v2, or a bug fix than can go out in a minor version?\nSorry for the delay (still figuring out how to handle GitHub email notifications), I think that looks like a \"bug fix\" or extra feature that could go in a minor version.\nIs there any progress? I have the same problem.\nNot yet, would you like to submit a PR.\nHi guys, thanks for the research on this topics.\r\n\r\nFor us, this is right now a blocker to go to production (not fulfilling good practices in documentation)...\r\nSo would you mind to provide me a small hint on where to start in the code, I will take a look and let see if I can do a PR 😊 \r\n\r\nThanks again for the efforts!\r\n\n@JavierMartinezAlc it looks like it is implemented [here](https://github.com/samuelcolvin/pydantic/blob/master/pydantic/schema.py#L778) and/or [there](https://github.com/samuelcolvin/pydantic/blob/master/pydantic/schema.py#L834)":1,"Would it make sense for `type=\"dl\"` to generate:\r\n\r\n```yaml\r\nstages:\r\n train:\r\n cmd: python train.py\r\n deps:\r\n - train.py\r\n metrics:\r\n - dvclive.json:\r\n cache: false\r\n plots:\r\n - dvclive/scalars:\r\n cache: false\r\n```\r\n\r\nWhere `dvclive` would be replaced by the value passed to `--live` (if any) ?\ncc @dberenbaum @skshetry \n@daavoo Would you be up to contribute this change?\n> @daavoo Would you be up to contribute this change?\r\n\r\nIf you all agree on proposed workaround, yes":1,"See https://github.com/iterative/dvc/issues/7462#issuecomment-1070954669":1,"@andronovhopf Indeed, md table is not complete without the trailing newline, which is a bit non-intuitive when compared to regular cli workflow (at least for me), but it totally makes sense to make this right. Looks like right now only cml is using this feature, so not too worried about breaking something for someone else. Will send a fix ASAP.\nHm, though it would still feel a bit weird when the table is the last thing in the file and you have a trailing newline for no reason. :thinking: \nAlso, not using a trailing newline means that you could expand the table on-the-fly. But that's a feature no one has asked for :smile: \nhahaha yes! I think the \"extra newline if the table is the last thing in\nyour report\" is probably only a minor weirdness. i imagine (although can't\nbe positive yet) that more people will have to debug \"why is everything\ngetting sucked into my table?\" than \"why is there an extra line after my\ntable?\"\n\nOn Fri, Jun 26, 2020 at 11:54 AM Ruslan Kuprieiev \nwrote:\n\n> Also, not using a trailing newline means that you could expand the table\n> on-the-fly. But that's a feature no one has asked for 😄\n>\n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly, view it on GitHub\n> , or\n> unsubscribe\n> \n> .\n>\n":1,"Seems like we don't pass the config options to the real filesystem, working on a PR\r\nhttps://github.com/iterative/dvc/blob/378486dbf53271ec894b4380f60ec02dc3351516/dvc/fs/http.py#L105-L111":1,"thanks for reporting, PR welcome.\nJust saw this, ugh. Will make a PR soon :)":1,"@shcheklein good catch!\r\n\r\n> The only difference is that one of them cached, one is not.\r\n\r\nJust a clarification: these two files are not cached for `master`/`bigrams-experiment` but not for `baseline-experiment`.\r\n\r\nI'm very surprised that `dvc diff` is reading the cache and depends on its state. We agreed that #2998 will be also included in the first version of the diff. It is crucial for CI/CD scenarios. Reopening it.\r\n\r\nPS: @shcheklein the url didn't work by default\r\n```\r\ngit clone git@github.com:iterative/example-get-started.git\r\nCloning into 'example-get-started'...\r\ngit@github.com: Permission denied (publickey).\r\nfatal: Could not read from remote repository.\r\n\r\nPlease make sure you have the correct access rights\r\nand the repository exists.\r\n```\n> the url didn't work by default\r\n>\r\n> `git clone git@github.com:iterative/example-get-started.git`\r\n\r\nHmmm weird. The repo is public. Is it because of the git@ SSH URL? Try with `git clone git@github.com:iterative/example-get-started.git` @dmpetrov?\r\n\r\nIf this is the case, we should update in https://dvc.org/doc/command-reference/get#example-compare-different-versions-of-data-or-model\r\n\r\nUPDATE: I'm changing this just in case in a regular updates PR to docs.\nWorth noting that after `pull` on baseline, message seems to be ok (that both paths are modified).":1,"@dberenbaum Not sure if this ever worked. What would be the correct workflow to get updates for a stage created with `import-url --version-aware`?\r\n\r\n\nLooks like a bug to me. `dvc update` should \"remember\" if it's a version-aware import.\n> It looks like dvc update only applies worktree updates for non-imported stages (i.e. dvc add data && dvc push):\r\n\r\nIt's not supposed to apply a worktree update in this case. `import_stages` is supposed to handle the version-aware case for import-url stages.\r\n\r\nI know `import-url`+`update` worked for individual files, but I don't remember if we tested `update` with directories after the `files` in deps change (https://github.com/iterative/dvc/pull/8528). The issue is probably that we aren't setting `dep.fs.version_aware` when we re-load an import stage from the .dvc file.\r\n\r\nFor files it should work as-is because the deps url will have a version ID in the URL (and we automatically enable `fs.version_aware` based on the versioned URL). But for dirs `s3://diglesia-bucket/data` will get handled as an non-version-aware filesystem.\r\n\r\n`Output.__init__()` probably needs to be updated so that we explicitly set `version_aware=True` in the `fs_config` when `files` is set (the bug here is for deps, but this really applies to outs as well)\r\nhttps://github.com/iterative/dvc/blob/f1c9e9365b1886758099c9f8e604817a33d767e4/dvc/output.py#L303\r\n\r\nI think after that fix the existing `update` behavior should work properly.\n> Output.__init__() probably needs to be updated so that we explicitly set version_aware=True in the fs_config when files is set (the bug here is for deps, but this really applies to outs as well)\r\n\r\nThinking about it more, it should be specific to `Dependency.__init__()`. For outputs it doesn't work because `out.fs` is local/repo FS (and should not be version aware) even when we have `files` (from pushing `out` to a remote)":1,"I just hit something throwing the same error. Pydantic version 1.8.2 (because 1.9.0 doesn't work for other reasons).\nI'm getting a similar error while using generics\r\n\r\n```\r\nT = TypeVar('T', bound=BaseModel)\r\n\r\nclass Paginated(Generic[T], BaseModel):\r\n total: int\r\n total_pages: int\r\n page: int\r\n per_page: int\r\n items: List[T]\r\n```\r\n\r\nand I'm doing something like this when it throws the error\r\n\r\n```\r\nPaginated[PydenticModelSchema](\r\n total=qs._pagination.total_results,\r\n total_pages=qs._pagination.num_pages,\r\n page=qs._pagination.page_number,\r\n per_page=qs._pagination.page_size,\r\n items=qs.results,\r\n )\r\n```\r\n\r\nbut it works if I remove the generic type and just use `List[Any]`\r\n\r\n```\r\nclass Paginated(BaseModel):\r\n total: int\r\n total_pages: int\r\n page: int\r\n per_page: int\r\n items: List[Any]\r\n```\r\n\r\nIs it because of the same bug? I couldn't find anything related to this online\n@iodsfx3d you should use `GenericModel` like explained in the doc\r\n```py\r\nfrom pydantic.generics import GenericModel\r\n...\r\n\r\nT = TypeVar('T', bound=BaseModel)\r\n\r\nclass Paginated(GenericModel, Generic[T]):\r\n total: T\r\n\r\n\r\nPaginated[str](total='qwe')\r\n```\n@adriangb Yep indeed! `Annotated` seems to add a dunder attribute which can't be set because of our custom `__setattr__`. I'll make a quick fix":1,"+1\r\n\r\nI unprotected and changed a single file in a directory. dvc add for this directory makes unnecessary unprotection and copy of other files.\n+1\r\n\r\nI unprotected and changed a single file in a directory. dvc add for this directory makes unnecessary unprotection and copy of other files.":1,"The solution is to allow naked `Dict` and treat it like `dict`.\r\n\r\nThis was referenced at https://github.com/samuelcolvin/pydantic/issues/545#issuecomment-495943391\r\n\r\nPR welcome to fix this.\nThe solution is to allow naked `Dict` and treat it like `dict`.\r\n\r\nThis was referenced at https://github.com/samuelcolvin/pydantic/issues/545#issuecomment-495943391\r\n\r\nPR welcome to fix this.":1,"I think we should emove the `if field.is_complex()` bit of `BaseSettings` and replace it with a universal validator `validate('*', pre=True)` which tries decoding JSON, but also in the case of lists supports comma separated lists.\r\n\r\nThat way you could easily override the validator if you so wished.\r\n\r\nI think this should be backwards compatible so could be done before v2. PR welcome.\nHi @samuelcolvin, I took a stab at your suggested implementation of moving the json decoding out of the `_build_environ` method and into a universal validator. Here is what that looks like (before trying to add in any parsing of comma-separated lists):\r\n\r\n```python\r\nclass BaseSettings(BaseModel):\r\n\r\n ...\r\n\r\n @validator('*', pre=True)\r\n def validate_env_vars(cls, v, config, field):\r\n if isinstance(v, str) and field.is_complex():\r\n try:\r\n return config.json_loads(v) # type: ignore\r\n except ValueError as e:\r\n raise SettingsError(f'error parsing JSON for \"{field}\"') from e\r\n return v\r\n```\r\n\r\nUnfortunately, this implementation ran into a problem with two tests: [`test_nested_env_with_basemodel`](https://github.com/samuelcolvin/pydantic/blob/5067508eca6222b9315b1e38a30ddc975dee05e7/tests/test_settings.py#L56-L68) and [`test_nested_env_with_dict`](https://github.com/samuelcolvin/pydantic/blob/5067508eca6222b9315b1e38a30ddc975dee05e7/tests/test_settings.py#L71-L79). \r\n\r\nThese two tests have an field `top` that is an inner mapping with fields `apple` and `banana`. These two fields are specified in different places and stitched together: dict `{'apple': 'value'}` is passed into the constructor and the string `'{\"banana\": \"secret_value\"}'` is set as an environment variable. In the [previous implementation](https://github.com/samuelcolvin/pydantic/blob/5067508eca6222b9315b1e38a30ddc975dee05e7/pydantic/env_settings.py#L26-L31), everything happens inside `__init__`: `_build_environ` is run first, which decodes the banana json into a dict, and then they are stitched together with the `deep_update` function. \r\n\r\nMoving the json decoding into a validator breaks this functionality because it runs after `__init__`. Because the banana mapping is still a string when `__init__` runs, `deep_update` isn't able to merge them and instead replaces the banana dict with the apple dict. \r\n\r\n## Option A: Drop support for merging nested objects\r\n\r\nOne option would be to drop support for merging nested objects. Complex environment variables seems like an unusual use case to start with, and needing to merge partially specified ones from different sources seems even more unusual. \r\n\r\nI discussed this with @pjbull and this is what we like the most: it would simplify the code and remove the need for a deep update (a shallow update would be enough). \r\n\r\n## Option B: Merging input streams after the universal decoding validator\r\n\r\nCurrently input streams are merged in `__init__` before running the validators. We could try an approach where the universal validator that does decoding runs on each of the input streams first, and then they get merged after. \r\n\r\nThis doesn't really fit into the existing flow very neatly and would involve making some part of the validation flow more complex.\r\n\r\n## Option C: Keeping decoding in _build_environ and use a different approach\r\n\r\nSuch as the approaches that @pjbull brainstormed. \nI faced this issue today, as well. I wanted to parse something like this\r\n\r\n```\r\nREDIS_SENTINELS=192.168.0.1 192.168.0.2\r\n```\r\n\r\nusing such a settings class:\r\n\r\n```\r\nclass S(BaseSettings):\r\n sentinels: List[str] = Field(..., env='REDIS_SENTINELS')\r\n\r\n @validator('sentinels', pre=True)\r\n def validate(cls, val):\r\n return val.split(' ')\r\n```\nDitto, I'd like to validate a string env var and transform it into a valid submodel. For example, `MY_DB=user:pass@server?max_connections=100` -> a settings model containing a DB submodel with valid DSN and other settings. Currently, it seems I can only pass MY_DB as a stringified JSON object.\nGiven the complexity of these potential use cases, I'm kind of liking something like proposal (1) in the first comment in this thread. I may have some time on Friday to implement if that approach is interesting\nhi all,\r\nI'm also faced with this issue today.\r\n\r\ntaking into account [this example](https://github.com/tiangolo/full-stack-fastapi-postgresql/blob/0.5.0/%7B%7Bcookiecutter.project_slug%7D%7D/backend/app/app/core/config.py), after almost a day of digging I realized that validator is not fired in case the class attribute is of List-type. If attribute type is str, for example, the attribute validator works just fine.\r\n\r\nI used this code:\r\n\r\n```python\r\nimport os\r\nfrom typing import List\r\nfrom pydantic import BaseSettings, validator\r\n\r\nos.environ['test_var'] = 'test_val'\r\n\r\n\r\nclass S1(BaseSettings):\r\n test_var: str\r\n \r\n @validator('test_var', pre=True)\r\n def val_func(cls, v):\r\n print('this validator is called: {}'.format(v))\r\n return v\r\n\r\nclass S2(BaseSettings):\r\n test_var: List[str]\r\n\r\n @validator('test_var', pre=True)\r\n def val_func(cls, v):\r\n print('this validator is called: {}'.format(v))\r\n return [v]\r\n\r\n```\r\n\r\nand then instantiating `s1 = S1()` prints `this validator is called: test_val` while the code `s2 = S2()` throws errors and prints nothing:\r\n\r\n```\r\n>>> s2 = S2()\r\nTraceback (most recent call last):\r\n File \"pydantic/env_settings.py\", line 118, in pydantic.env_settings.BaseSettings._build_environ\r\n File \"/home/den/anaconda3/lib/python3.7/json/__init__.py\", line 348, in loads\r\n return _default_decoder.decode(s)\r\n File \"/home/den/anaconda3/lib/python3.7/json/decoder.py\", line 337, in decode\r\n obj, end = self.raw_decode(s, idx=_w(s, 0).end())\r\n File \"/home/den/anaconda3/lib/python3.7/json/decoder.py\", line 355, in raw_decode\r\n raise JSONDecodeError(\"Expecting value\", s, err.value) from None\r\njson.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)\r\nThe above exception was the direct cause of the following exception:\r\nTraceback (most recent call last):\r\n File \"\", line 1, in \r\n File \"pydantic/env_settings.py\", line 35, in pydantic.env_settings.BaseSettings.__init__\r\n File \"pydantic/env_settings.py\", line 48, in pydantic.env_settings.BaseSettings._build_values\r\n File \"pydantic/env_settings.py\", line 120, in pydantic.env_settings.BaseSettings._build_environ\r\npydantic.env_settings.SettingsError: error parsing JSON for \"test_var\"\r\n\r\n```\r\nis there any errors in my example code?\n@zdens per some of the discussion earlier in the thread (kind of mixed in there with proposed changes), the reason you don't see the validator firing is because the code that is failing is the part that parses the environment variables, and that happens before the validators run. \r\n\r\nYour variable that is the list needs to be valid JSON, like this:\r\n\r\n```\r\nOPTIONS='[\"a\",\"b\",\"c\"]'\r\n```\r\n\r\nThat's why you see a `JSONDecodeError`.\n@jayqi ,\r\nthank you for your reply!\r\nnow I understood why this thread has been started.\nAs a workaround (until something solid is implemented) I changed the following\r\n\r\n```python3\r\nCORS_ORIGINS: List[AnyHttpUrl] = Field(..., env=\"CORS_ORIGINS\")\r\n```\r\n\r\ninto this:\r\n\r\n```python3\r\nCORS_ORIGINS: Union[str, List[AnyHttpUrl]] = Field(..., env=\"CORS_ORIGINS\")\r\n```\r\n\r\nWhich, admittedly, is not elegant but enables pydantic to fire up the validator function:\r\n\r\n```python3\r\n@validator(\"CORS_ORIGINS\", pre=True)\r\n def _assemble_cors_origins(cls, cors_origins):\r\n if isinstance(cors_origins, str):\r\n return [item.strip() for item in cors_origins.split(\",\")]\r\n return cors_origins\r\n```\r\n\r\nMy `.env` file:\r\n\r\n```env\r\n# Use comma (,) to separate URLs\r\nCORS_ORIGINS=http://localhost:3000,http://localhost:8000\r\n```\nI've just discovered how annoying this can be myself while working on a github action for pydantic 🙈.\r\n\r\nI'd love someone to fix this, otherwise I will soon.\nI planned on working on https://github.com/samuelcolvin/pydantic/pull/1848 again soon (re-implement/finish it), but after finishing with https://github.com/samuelcolvin/pydantic/pull/2721\n🎉 I think that if #1848 goes in then we can check for those types here:\r\nhttps://github.com/samuelcolvin/pydantic/blob/42395056e18dfaa3ef299373374ab3b12bb196ac/pydantic/env_settings.py#L170-L174\r\n\r\nAnd then we can keep the JSON fallback behavior as well.\nI suggest that this issue should also consider adding the ability to parse environment variables into dictionaries directly:\r\n\r\n```python\r\nimport os\r\nfrom typing import Optional, Dict\r\nfrom pydantic import BaseSettings, Field, validator\r\n\r\nos.environ[\"COLORS\"] = \"red:#FF0000,blue:#0000FF,green:#00FF00\"\r\n\r\n\r\nclass Example(BaseSettings):\r\n colors: Optional[Dict[str, str]] = Field(None, env=\"COLORS\")\r\n\r\n # Result would be:\r\n colors = {\"red\": \"#FF0000\", \"blue\": \"#0000FF\", \"green\": \"#00FF00\"}\r\n\r\n```\r\n\r\n\nIt seems with the addition of `SecretsSettingsSource` the parsing code got a little bit duplicate. \r\n\r\nI think that now it makes more sense to follow Option 1 described by @pjbull, but also to delegate the whole parsing logic to the Field, i.e: `field.parse(value)`, instead of having the following code in all sources\r\n```\r\nif field.is_complex():\r\n try:\r\n secret_value = settings.__config__.json_loads(secret_value)\r\n except ValueError as e:\r\n raise SettingsError(f'error parsing JSON for \"{env_name}\"') from e\r\n```\r\n\r\nI could try this implementation if desired @samuelcolvin.":1,"I can probably look at this this weekend... I don't think many people are using generics in 3.9 yet\nYes you're right but supporting generic types seems to be rational, According to [PEP585](https://www.python.org/dev/peps/pep-0585/) legacy typing.List , typing.Dict , ... are **Deprecated** since python3.9 and will be removed from python.":1,"@jorgeorpinel So having `data`, right? Git does the same thing, hence why we use `/data` in `.gitignore` when we `dvc add data`.\nMaybe it behaves differently in distinct OSs? I'm on Windows (Cmder/ Git Bash):\r\n\r\n```\r\nλ git init\r\nλ touch data data2 data3 data4\r\nλ echo data > .gitignore\r\nλ ls\r\ndata data2 data3 data4\r\nλ git status\r\n...\r\nUntracked files:\r\n (use \"git add ...\" to include in what will be committed)\r\n .gitignore\r\n data2\r\n data3\r\n data4\r\nλ git add data\r\nThe following paths are ignored by one of your .gitignore files:\r\ndata\r\nUse -f if you really want to add them.\r\nλ git add .\r\nλ git status\r\n...\r\n new file: .gitignore\r\n new file: data2\r\n new file: data3\r\n new file: data4\r\n```\n@jorgeorpinel Oh, I misunderstood your report. Need to check that, indeed. @pared Maybe you have any ideas?\nWill check this, sorry for late response\n@jorgeorpinel that was happening on windows right?\r\nfollowing test is passing on my linux machine for `0.90.2`:\r\n```\r\ndef test_ignore_data(tmp_dir, dvc):\r\n tmp_dir.gen({\"data\": \"data\", \"data1\": \"data1\", \"data2\": \"data2\",\r\n \"data3\":\"data3\", \".dvcignore\": \"data\"})\r\n\r\n\r\n files = []\r\n for r, d, fs in dvc.tree.walk(\".\"):\r\n files.extend([os.path.join(r, f) for f in fs])\r\n\r\n assert set(files) == set([\"./data1\", \"./data2\", \"./data3\", \"./.dvcignore\"])\r\n```\nSorry guys. I don't remember which DVC commands I noticed originally that don't respect files in .dvcignore. It wasn't a great report... But I'm QAing this and I think there's definitely some funny stuff happening:\r\n\r\n```console\r\n$ echo data > data\r\n$ echo data > .dvcignore\r\n$ dvc add data\r\n100% Add|██... # Works and puts it in .gitignore. Should ignore? E.g.:\r\n\r\n$ git add data\r\nThe following paths are ignored by one of your .gitignore files:\r\ndata\r\nUse -f if you really want to add them.\r\n```\r\n\r\nI'm on 0.93.0 from exe installer now. Yes, Windows (Git Bash on Cmder)\r\n\r\nAlso, the first example in https://dvc.org/doc/user-guide/dvcignore#examples doesn't work for me (all files inside data/ dir are added and cached). I didn't check the others.\r\n\n@jorgeorpinel hmm, that does not seem right. \r\nI think we should behave in a similar way as git does, which is informing the user that his output collides with an entry of some `.dvcignore` file.\r\nThis functionality can be implemented probably after we introduce something like `git check-ignore` for `.dvcignore`. I think there was an issue for that already, but I am unable to find it.\nHello! Update here, I'm on DVC 1.3 and this seems solved, although the message I get,\r\n\r\n```console\r\n$ dvc add data\r\nAdding...\r\nERROR: output 'data' does not exist\r\n```\r\n\r\ncould be improved, similar to what `git add` uses for files in .gitignore patterns:\r\n\r\n```\r\nThe following paths are ignored by one of your .gitignore files:\r\ndata\r\nUse -f if you really want to add them.\r\n```\r\n\r\nAnd, should we have a `-f`/`--force` option for add as well?\r\n\r\nThanks\n@jorgeorpinel Thanks for the update! Indeed, that message could be improved.\r\n\r\n> And, should we have a -f/--force option for add as well?\r\n\r\nI would rather not do that. We've seen it causing very odd bugs in git, wouldn't want that for dvc unless there are some very good scenarios. Would wait for someone to ask for it.\nIt seems the conflation of concepts \"exists\" and \"ignored\" leads to confusing error messages. In my case one of \"run\" outputs was by mistake ignored in .dvcignore, but the respective message was confusingly saying the file \"does not exist\". Possibly related source: [dvc/tree/local.py#L79](https://github.com/iterative/dvc/blob/12c7013062c89a4f9f75d7459a7ed654f3ac174f/dvc/tree/local.py#L79).\n@autayeu hi!\r\nCould you share some info on your setup?\r\n`.dvcignore` contained your `run` output before you actually `dvc run` it, right?\nSure. Attached [dvc.message.repro.zip](https://github.com/iterative/dvc/files/5063241/dvc.message.repro.zip) is a minimum setup to reproduce the issue. To reproduce:\r\n\r\nUnpack, change into dvc.message.repro directory and run:\r\n```bash\r\ndvc run -n preprocess -d preprocess.py -o data.txt -o data.log \"python -u preprocess.py | tee -i data.log\"\r\n```\r\nYou'll see:\r\n```text\r\nRunning stage 'preprocess' with command:\r\n\tpython -u preprocess.py | tee -i data.log\r\nscreen content\r\nERROR: output 'data.log' does not exist\r\n```\r\nHowever:\r\n```bash\r\n(dvc) zzz:dvc.message.repro zzz$ ls -l\r\ntotal 24\r\n-rw-r--r-- 1 zzz zzz 15 Aug 12 15:45 data.log\r\n-rw-r--r-- 1 zzz zzz 12 Aug 12 15:45 data.txt\r\n-rw-r--r-- 1 zzz zzz 84 Aug 12 15:39 preprocess.py\r\n```\r\nSo data.log does exist. A bit unexpectedly, dvc also created empty .gitignore file:\r\n```bash\r\n(dvc) zzz:dvc.message.repro zzz$ ls -l .gitignore\r\n-rw-r--r-- 1 zzz zzz 0 Aug 12 16:05 .gitignore\r\n```\r\n\r\nOther relevant outputs:\r\n```bash\r\n(dvc) zzz:dvc.message.repro zzz$ cat .dvcignore\r\n*.log\r\n```\r\n```bash\r\n(qac) zzz:dvc.message.repro zzz$ dvc version\r\nDVC version: 1.4.0+12c701\r\n\r\n---------------------------------\r\nPlatform: Python 3.8.5 on macOS-10.15.6-x86_64-i386-64bit\r\nSupports: azure, gdrive, gs, hdfs, http, https, s3, ssh, oss\r\nCache types: reflink, hardlink, symlink\r\nRepo: dvc, git\r\n```\n@autayeu Thank you! It seems to me that we should rethink the message.":1,"Thanks for reporting. Amazing this has never come up before.\r\n\r\nShould be relatively simple to fix in [`pydantic/json.py`](https://github.com/samuelcolvin/pydantic/blob/master/pydantic/json.py), the only tricky thing is dealing with conditional imports.\n@samuelcolvin hey I'm trying to fix this bug and I'm encountering the tricky conditional imports thing. Would it be easier to move `NameEmail` to `pydantic/types.py` like `SecretStr`?\nHumm, I would prefer not to.\r\n\r\nWhat is the problem? network.py shouldn't import json.py":1,"@jnissin, can you share the output from `dvc push -v`? \nHere you go @skshetry :\r\n\r\n```console\r\n$ dvc push -v\r\n2022-05-11 13:48:51,201 DEBUG: Preparing to transfer data from '/Users/***/Documents/code/work/***/.dvc/cache' to 'gs://valimo-dvc-storage'\r\n2022-05-11 13:48:51,201 DEBUG: Preparing to collect status from 'gs://valimo-dvc-storage'\r\n2022-05-11 13:48:51,201 DEBUG: Collecting status from 'gs://valimo-dvc-storage'\r\n2022-05-11 13:48:51,204 ERROR: unexpected error - unsupported pickle protocol: 5\r\n------------------------------------------------------------\r\nTraceback (most recent call last):\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/cli/__init__.py\", line 90, in main\r\n ret = cmd.do_run()\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/cli/command.py\", line 22, in do_run\r\n return self.run()\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/commands/data_sync.py\", line 68, in run\r\n glob=self.args.glob,\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/repo/__init__.py\", line 48, in wrapper\r\n return f(repo, *args, **kwargs)\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/repo/push.py\", line 69, in push\r\n obj_ids, jobs, remote=remote, odb=odb or dest_odb\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data_cloud.py\", line 91, in push\r\n cache_odb=self.repo.odb.local,\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data/transfer.py\", line 155, in transfer\r\n src, dest, obj_ids, check_deleted=False, jobs=jobs, **kwargs\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data/status.py\", line 181, in compare_status\r\n dest, obj_ids, index=dest_index, jobs=jobs, **kwargs\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data/status.py\", line 138, in status\r\n odb, index, dir_objs, name, cache_odb, jobs=jobs\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data/status.py\", line 36, in _indexed_dir_hashes\r\n indexed_dirs = set(index.dir_hashes())\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data/db/index.py\", line 119, in dir_hashes\r\n yield from (hash_ for hash_, is_dir in self.index.items() if is_dir)\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/dvc/data/db/index.py\", line 119, in \r\n yield from (hash_ for hash_, is_dir in self.index.items() if is_dir)\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/_collections_abc.py\", line 744, in __iter__\r\n yield (key, self._mapping[key])\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/diskcache/persistent.py\", line 730, in __getitem__\r\n return self._cache[key]\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/diskcache/core.py\", line 1232, in __getitem__\r\n value = self.get(key, default=ENOVAL, retry=True)\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/diskcache/core.py\", line 1173, in get\r\n value = self._disk.fetch(mode, filename, db_value, read)\r\n File \"/opt/anaconda3/envs/valimo-local/lib/python3.7/site-packages/diskcache/core.py\", line 285, in fetch\r\n return pickle.load(io.BytesIO(value))\r\nValueError: unsupported pickle protocol: 5\r\n------------------------------------------------------------\r\n2022-05-11 13:48:51,316 DEBUG: Removing '/Users/***/Documents/code/work/***/.mJCQTQ7VWcdKbQvxRdcp2y.tmp'\r\n2022-05-11 13:48:51,318 DEBUG: Removing '/Users/***/Documents/code/work/***/.mJCQTQ7VWcdKbQvxRdcp2y.tmp'\r\n2022-05-11 13:48:51,318 DEBUG: Removing '/Users/***/Documents/code/work/***/.mJCQTQ7VWcdKbQvxRdcp2y.tmp'\r\n2022-05-11 13:48:51,318 DEBUG: Removing '/Users/***/Documents/code/work/***/.dvc/cache/.68G3bcZEzc4zjdHpDsNqYj.tmp'\r\n2022-05-11 13:48:51,322 DEBUG: Version info for developers:\r\nDVC version: 2.10.2 (conda)\r\n---------------------------------\r\nPlatform: Python 3.7.11 on Darwin-21.2.0-x86_64-i386-64bit\r\nSupports:\r\n gs (gcsfs = 2022.1.0),\r\n webhdfs (fsspec = 2022.1.0),\r\n http (aiohttp = 3.8.1, aiohttp-retry = 2.4.6),\r\n https (aiohttp = 3.8.1, aiohttp-retry = 2.4.6)\r\nCache types: reflink, hardlink, symlink\r\nCache directory: apfs on /dev/disk1s1s1\r\nCaches: local\r\nRemotes: gs\r\nWorkspace directory: apfs on /dev/disk1s1s1\r\nRepo: dvc, git\r\n\r\nHaving any troubles? Hit us up at https://dvc.org/support, we are always happy to help!\r\n2022-05-11 13:48:51,326 DEBUG: Analytics is enabled.\r\n2022-05-11 13:48:51,457 DEBUG: Trying to spawn '['daemon', '-q', 'analytics', '/var/folders/4p/0n_mm8js23x1vhydv_3yq8b40000gq/T/tmp_4ld4dv3']'\r\n2022-05-11 13:48:51,459 DEBUG: Spawned '['daemon', '-q', 'analytics', '/var/folders/4p/0n_mm8js23x1vhydv_3yq8b40000gq/T/tmp_4ld4dv3']'\r\n```\nThis seems like https://dvc.org/doc/user-guide/troubleshooting#pickle but we are not catching the exception in `pull` in order to redirect users to the link:\r\n\r\nhttps://github.com/iterative/dvc/blob/47d10c4a8b9bdc18dec17a9380f0593e43383c4c/dvc/utils/decorators.py#L13-L30\nTrue, I can confirm that the following fixed the issue:\r\n\r\n```\r\nrm -r .dvc/tmp/index .dvc/tmp/md5s .dvc/tmp/links\r\n```\r\n\r\nThis is probably due to the fact that we have python 3.8 running in our pre-commit hooks environment.\n@jnissin this behavior (but not the incorrect error message) is expected if you are mixing python3.8 and 3.7 usage within the same repo. See the docs linked by @daavoo, you will need to remove `.dvc/tmp/index` before running in python 3.7 in this case.\nAlright, I'll try to switch our pre-commit environment to use python 3.7 as well. Thanks a lot!\n@jnissin Btw, did you migrate from an older dvc version recently? We had a bug where we didn't set pickle version https://github.com/iterative/dvc/pull/7222 , but it was fixed 5 months back in 2.9.4":1,"OK, after some digging, I've figured out why this is happening. Due to how `create_model` is called in `GenericModel.__class_getitem__`, we have the following class relationships:\r\n\r\n* `ConcreteInnerClass[int] < ConcreteInnerClass[T]`\r\n* `BaseInnerClass[int] < BaseInnerClass[T]`\r\n* `ConcreteInnerClass[T] < BaseInnerClass[T]`\r\n\r\nBut we are missing the following:\r\n\r\n* `ConcreteInnerClass[int] < BaseInnerClass[int]`":1,"I don't think there's currently a solution for this. The most relevant discussion to this is #659, though I wouldn't all this a duplicate since that's specific to `from_orm`.\r\n\r\nThe short answer is that pydantic doesn't (yet) have any solution for detecting and coping with circular references.\r\n\r\nIf you have a suggestion of a solution, please comment on #659 or submit a demo PR. I have no idea off the top of my head, how hard it would be to use the same approach for `from_orm`, `parse_obj` and our case above - or if they're even particularly linked.":1,"+1 ran into this issue, it's a very valid use case and should be an easy fix\r\n\r\nThis also will happen if you call `ModelField.infer` twice on the same parameter/field, even if you are not using a type alias\nSeems like we are also affected by this issue. Any chance to fix this soon?\n@PrettyWood any chance the team can get to this bug soon?\nThis appears related to #3714.\r\n\r\n@Jaakkonen - did you try running the unit tests after changing to a copy of the `FieldInfo` object? I got some failures so it might be that this mutation is required in other places.\r\n\r\n```\r\nFAILED tests/test_generics.py::test_replace_types - IndexError: tuple index out of range\r\nFAILED tests/test_schema.py::test_unenforced_constraints_schema[kwargs9-type_9] - IndexError: tuple index out of range\r\n\r\nResults (36.46s):\r\n 2287 passed\r\n 2 failed\r\n - tests/test_generics.py:761 test_replace_types\r\n - tests/test_schema.py:1520 test_unenforced_constraints_schema[kwargs9-type_9]\r\n 7 skipped\r\nmake: *** [Makefile:63: test] Error 1\r\n```\n@adriangb any chance you could have a go at a fix? 😄 🙏 \r\n\r\nI think this is also causing #3714 which in turn in one of the only remaining blockers to v1.9.1.\nBTW, I find that the code works with pydantic 1.8.2, so this problem may be introduced via 1.9.0\nI also experience the same behavior as @StephenPCG.\r\n\r\n```\r\nC:\\dev\\pydantic-discrimination-union-problem>python -c \"import pydantic.utils; print(pydantic.utils.version_info())\" \r\n pydantic version: 1.9.0\r\n pydantic compiled: True\r\n install path: C:\\Users\\jol\\venv\\pydantic-discrimination-union-problem\\Lib\\site-packages\\pydantic\r\n python version: 3.9.9 (tags/v3.9.9:ccb0e6a, Nov 15 2021, 18:08:50) [MSC v.1929 64 bit (AMD64)]\r\n platform: Windows-10-10.0.19043-SP0\r\n optional deps. installed: ['typing-extensions']\r\n```\r\n\r\nI have a bigger example ([source](https://github.com/josteinl/pydantic-discrimination-union-problem/tree/pydantic_1.9.0_trial#yet-another-problem)) using FastAPI.\r\n\r\n```python\r\nimport enum\r\nfrom typing import List, Union, Literal\r\n\r\nfrom typing_extensions import Annotated\r\nfrom fastapi import FastAPI\r\nfrom pydantic import Field, BaseModel\r\nimport uvicorn\r\n\r\n\r\nclass CutleryTypeEnum(enum.IntEnum):\r\n KNIFE = 1\r\n FORK = 2\r\n SPOON = 3\r\n\r\n\r\nclass CutleryBase(BaseModel):\r\n name: str\r\n\r\n\r\nclass Knife(CutleryBase):\r\n cutlery_type_id: Literal[CutleryTypeEnum.KNIFE]\r\n\r\n\r\nclass Fork(CutleryBase):\r\n cutlery_type_id: Literal[CutleryTypeEnum.FORK]\r\n number_of_teeth: int = None\r\n\r\n\r\nclass Spoon(CutleryBase):\r\n cutlery_type_id: Literal[CutleryTypeEnum.SPOON]\r\n volume: float = None\r\n\r\n\r\nCutlery = Annotated[\r\n Union[Knife, Fork, Spoon],\r\n Field(discriminator='cutlery_type_id'),\r\n]\r\n\r\napp = FastAPI()\r\n\r\n\r\n@app.get(\"/cutlery\",\r\n response_model=List[Cutlery])\r\nasync def get_cutlery():\r\n return [{'cutlery_type_id': CutleryTypeEnum.KNIFE, 'name': 'My sharp knife'},\r\n {'cutlery_type_id': CutleryTypeEnum.FORK, 'name': 'The three teeth fork'},\r\n {'cutlery_type_id': CutleryTypeEnum.SPOON, 'name': 'Tea spoon'}]\r\n\r\n#\r\n# Enable the second usage of Cutlery result in traceback on startup\r\n#\r\n\r\n@app.get(\"/cutlery2\",\r\n response_model=List[Cutlery])\r\nasync def get_cutlery2():\r\n return [{'cutlery_type_id': CutleryTypeEnum.KNIFE, 'name': 'My sharp knife'},\r\n {'cutlery_type_id': CutleryTypeEnum.KNIFE, 'name': 'My knife is sharp'},\r\n {'cutlery_type_id': CutleryTypeEnum.FORK, 'name': 'The three teeth fork'},\r\n {'cutlery_type_id': CutleryTypeEnum.SPOON, 'name': 'Tea spoon'}]\r\n\r\nuvicorn.run(app, host='127.0.0.1', port=80)\r\n```\r\n\r\nIf I enable the endpoint /cutlery2 I get the following traceback on start-up:\r\n\r\n```\r\npython main.py \r\nTraceback (most recent call last):\r\n File \"C:\\dev\\pydantic-discrimination-union-problem\\main.py\", line 64, in \r\n async def get_cutlery2():\r\n File \"C:\\Users\\jol\\venv\\pydantic-discrimination-union-problem\\lib\\site-packages\\fastapi\\routing.py\", line 582, in decorator\r\n self.add_api_route(\r\n File \"C:\\Users\\jol\\venv\\pydantic-discrimination-union-problem\\lib\\site-packages\\fastapi\\routing.py\", line 525, in add_api_route\r\n route = route_class(\r\n File \"C:\\Users\\jol\\venv\\pydantic-discrimination-union-problem\\lib\\site-packages\\fastapi\\routing.py\", line 351, in __init__\r\n self.response_field = create_response_field(\r\n File \"C:\\Users\\jol\\venv\\pydantic-discrimination-union-problem\\lib\\site-packages\\fastapi\\utils.py\", line 65, in create_response_field\r\n return response_field(field_info=field_info)\r\n File \"pydantic\\fields.py\", line 419, in pydantic.fields.ModelField.__init__\r\n File \"pydantic\\fields.py\", line 534, in pydantic.fields.ModelField.prepare\r\n File \"pydantic\\fields.py\", line 728, in pydantic.fields.ModelField._type_analysis\r\n File \"pydantic\\fields.py\", line 776, in pydantic.fields.ModelField._create_sub_type\r\n File \"pydantic\\fields.py\", line 451, in pydantic.fields.ModelField._get_field_info\r\nValueError: `Field` default cannot be set in `Annotated` for '_Response_get_cutlery2_cutlery2_get'\r\n```\r\n\nReplacing my Cutlery class with this seems to work OK:\r\n\r\n```python\r\nclass Cutlery(BaseModel):\r\n __root__: Annotated[\r\n Union[Knife, Fork, Spoon],\r\n Field(discriminator='cutlery_type_id'),\r\n ]\r\n\r\n```\n> BTW, I find that the code works with pydantic 1.8.2, so this problem may be introduced via 1.9.0\r\n\r\nThanks for that. Some code working last year with 1.8.2 is not working with 1.9.0 and it looks like this is the reason.\nAlso experiencing this error. In my case the error appears when I use an Annotated field twice in the same model. Using Pydantic v1.9.0.\r\n\r\n```\r\nfrom typing import Literal, Union, List\r\nfrom typing_extensions import Annotated\r\nfrom pydantic import BaseModel, Field \r\n\r\nclass Cat(BaseModel):\r\n pet_type: Literal['cat']\r\n\r\nclass Dog(BaseModel):\r\n pet_type: Literal['dog']\r\n\r\nPets = Annotated[Union[Cat, Dog], Field(discriminator='pet_type')] # noqa: F821\r\n\r\nclass Model(BaseModel):\r\n pets_field1: Pets\r\n pets_field2: List[Pets]\r\n```\r\n`ValueError: 'Field' default cannot be set in 'Annotated' for 'pets_field2'`\nI think the fundamental problem here is the usage of our `Annotated` class inside a `List[]`. The code around this is way too complicated for me to understand.\r\n\r\n@havardthom have you tried to define `Pets` as:\r\n\r\n```python\r\nclass Pets(BaseModel):\r\n __root__: Annotated[\r\n Union[Cat, Dog],\r\n Field(discriminator='pet_type'),\r\n ]\r\n```\n> I think the fundamental problem here is the usage of our `Annotated` class inside a `List[]`. The code around this is way too complicated for me to understand.\r\n> \r\n> @havardthom have you tried to define `Pets` as:\r\n> \r\n> ```python\r\n> class Pets(BaseModel):\r\n> __root__: Annotated[\r\n> Union[Cat, Dog],\r\n> Field(discriminator='pet_type'),\r\n> ]\r\n> ```\r\n\r\nYes I got it working with root model, although I had to refactor parts of my solution to extract the `__root__` object. A pure annotation field would be preferable.\nI confirm that the following code runs smoothly in pydantic 1.8.2 but raises an error (as noted) in 1.9.0\r\n```python\r\nfrom __future__ import annotations\r\n\r\nfrom typing import List\r\nfrom typing import Literal\r\nfrom typing import Union\r\n\r\nfrom pydantic import BaseModel\r\nfrom pydantic import Field\r\nfrom typing_extensions import Annotated\r\n\r\n\r\nclass A(BaseModel):\r\n operator: Literal[\"a\"]\r\n foo: str\r\n cs: List[C]\r\n\r\n\r\nclass B(BaseModel):\r\n operator: Literal[\"b\"]\r\n foo: str\r\n cs: List[C]\r\n\r\n\r\nC = Annotated[\r\n Union[A, B],\r\n Field(discriminator=\"operator\"),\r\n]\r\n\r\nA.update_forward_refs()\r\n\r\n# B is not prepared and requires call to update_forward_refs\r\n# but this will yield a ValueError in pydantic 1.9.0\r\nB.update_forward_refs()\r\n# ValueError: `Field` default cannot be set in `Annotated` for '_cs'\r\n````\r\n\r\nUsing a redefinition of `C` like suggested above (and in the docs)\r\n```python\r\nclass C(BaseModel):\r\n __root__: Annotated[Union[A, B], Field(discriminator=\"operator\")]\r\n```\r\ndoes make the code run. However, it seems to also require some additional imho rather ugly attribute access\r\n```python\r\nb = B(operator=\"b\", foo=\"foo\", cs=[A(operator=\"a\", foo=\"bar\", cs=[]] )\r\nprint( b.cs[0].__root__.bar ) # instead of previously b.cs[0].bar\r\n``` \nRan into this too, I've tried to see if I can understand what is causing this as `DiscriminatedUnion` is a super useful feature!\r\n\r\nLooks like this is a regression that was previously [caught here](https://github.com/samuelcolvin/pydantic/pull/2147/commits/6835179f5c431fa071dd50dfdc31685f2463a23c).\r\n\r\nThe issue seems to be that the FieldInfo/Annotation is being mutated to set the default, which means on the second time around this is getting tripped up\r\n\r\nThe regression appears to be introduced here when the `__eq__` was fixed: #2502 (specifically [this line](https://github.com/samuelcolvin/pydantic/blob/master/pydantic/fields.py#L454))\r\n\r\n@PrettyWood / @JacobHayes - do you think it would it make sense to have a way of cloning the object here to avoid mutating the object here? Or would it be possible to avoid setting the `default` value here all together? #\nI've tested a fix where we do not mutate the original `FieldInfo` object, but this causes failures else where (in tests that do not directly call `_get_field_info`) so the it looks like the copy/new is a no go unfortunately.\nAppears to be related to this too #3702":1,"Hi @digitalillusions ! Thank you for reporting this issue! This is a result of our run-cache feature, that started caching even unchaged outputs to be able to restore stages when needed. We definitely had small git-tracked files in mind, but clearly it is not the case here. We could consider somehow explicitly disabling the run-cache for the specified stages. The first idea that comes to my mind is to have some flag for `dvc run` that would add the flag to the generated stage spec and so dvc would know not to try to save this stage to the run-cache. We already have `dvc run --no-run-cache` that tells dvc not to use existing run-cache, but it still tries to save the results of this run :slightly_frowning_face: \nThanks @efiop for the response! Ah thats right, I remember reading about this in the 1.0 update. I also never noticed before, because I set up my pipelines before 1.0 came out and only now made a clean clone of my repo somewhere else and used the repro functionality to reproduce the state.\r\n\r\n> We could consider somehow explicitly disabling the run-cache for the specified stages. The first idea that comes to my mind is to have some flag for dvc run that would add the flag to the generated stage spec and so dvc would know not to try to save this stage to the run-cache.\r\n\r\nI think that would be a good idea. Though to me it would still be somewhat confusing having to, e.g. set both `cache: false, run-cache: false` in my `dvc.yaml`. Or would you specify the `run-cache: false` for the entire pipeline stage? Or only specify `run-cache: false` which would imply `cache: false`?\r\n\r\nTo me it was also just super unintuitive and frustrating to see 12Gb of data being saved to `.dvc/cache`, when I obviously set the `cache` flag to false.\n@digitalillusions Yeah, I meant `run_cache: False`(or something like that) for the whole stage, rather than for every output. That might be useful for other applications as well.\nBut would you then in addition have to specify `cache: false` for the individual outputs? Other than that seems like a nice solution to me.\n@digitalillusions Correct, we would. The reason is that `cache: false` is solely for data management purposes, meaning that it won't be affected by `dvc checkout/pull/push/etc`. So in terms of a `dvc run` it would look something like `dvc run --no-save-run-cache -O my_uncached_out ...`. Don't like the `--no-save-run-cache` naming though, will need to figure something out.\n> The reason is that cache: false is solely for data management purposes\r\n\r\nYeah, `cache:` became a bit misleading name now :( No ideas, how to rename or how to name new options yet though ...\r\n\r\n\nWould it be an option to provide keyword arguments? So instead of having `--no-run-cache`, you could have `--run-cache (ignore | disable)` where `ignore` would be the old `--no-run-cache` and `disable` would be to completely disable the run cache for that specific stage.\n@digitalillusions Great idea! Yeah, could think about using something like that. :+1: \nI think we should bump the priority on this issue. It seems like `no-cache` effectively does not exist since 1.0:\r\n\r\n```\r\n#!/bin/bash\r\n\r\nrm -rf repo\r\nmkdir repo\r\npushd repo\r\n\r\ngit init --quiet\r\ndvc init --quiet\r\n\r\necho hello >> hello\r\ndvc add hello\r\ngit add -A\r\ngit commit -am \"init\"\r\n\r\ndvc run -n run -d hello -O hello.txt --no-run-cache \"cat hello >> hello.txt && echo 'modification' >> hello.txt\"\r\n```\r\nResults in saving `hello.txt` to cache.\r\n\r\n\r\n \r\n\r\n\nHello :) I have the same kind of problem: \r\nA preprocessing stage that takes a big folder as input and produces a big folder as output. It would be great if there was a easy and fine grained way of specifying where the output of a stage ends up being. As far as I can see there are the following options for an output of stage:\r\n- dvc does nothing\r\n- dvc stores hashsums\r\n- dvc stores full output\r\n\r\nI understand that the run-cache is useful. So what about the following:\r\n- `dvc run -o` -> dvc stores full output\r\n- `dvc run -O5` -> dvc stores hashsums and the last 5 versions of the output temporary. For run 6, dvc deletes output of run 1.\r\n- `dvc run -O` -> same as now\r\n\r\nWould this be possible?\r\nThanks \r\n\r\n\n@jimmytudeski Unfortunately there is no LRU functionality in our cache yet, so we would need to figure it out first.\r\nA faster, and arguably more proper fix for this is to pass `run_cache` argument to `stage.save` and if `not run_cache` not call `stage_cache.save` https://github.com/iterative/dvc/blob/d3acbfe2b1aae2d05cb9b8732167e27f7c5f740e/dvc/stage/__init__.py#L439 . `Stage.run` already receives it https://github.com/iterative/dvc/blob/d3acbfe2b1aae2d05cb9b8732167e27f7c5f740e/dvc/stage/__init__.py#L488 , but only passes it to `run_stage`, but it should also pass it to `stage.save()`. That will make `dvc run --no-run-cache` and `dvc repro --no-run-cache` not save the run cache for particular stages. Though granularity still requires `run_cache: true/false` per-output, as described in my other comment above :(\nHad a very good discussion with @dberenbaum yesterday, and there are a few clear points:\r\n\r\n1) the `run-cache` name adds to the confusion with our regular local cache. If there are any good alternative names, we'll be happy to consider them. IIRC initially we called it `stage cache`, but it was before we've acknowledged the \"stage\" terminology before 1.0 release. \r\n\r\n2) we def need stage-level flag in dvc.yaml to tell dvc not to save or restore from run-cache. E.g.\r\n```\r\nstages:\r\n ...\r\n - mystage:\r\n cmd: mycmd\r\n run_cache: false\r\n```\r\nthis way the changes will be permanent.\r\n\r\n3) the cli flags could be improved. E.g.\r\n * `--force` in run/repro should probably imply `--no-run-cache`\r\n * current `--no-run-cache` is actually `--no-restore-run-cache` and might need to be renamed because of stage-level `run_cache: true/false` flag.\r\n \r\nOverall, we could definitely introduce `run_cache: true/false` for stages in dvc.yaml right now, even without corresponding CLI flag, so people could start using it. But in CLI, we could remove `--no-run-cache` flag in both run/repro, make `--force` in run/repro ignore run-cache and introduce `--no-run-cache` to `dvc stage add`, that will set `run_cache: true/false` flag.\r\n\r\nCC @dberenbaum @jorgeorpinel ^\n> the run-cache name adds to the confusion with our regular local cache. If there are any good alternative names, we'll be happy to consider them. IIRC initially we called it stage cache, but it was before we've acknowledged the \"stage\" terminology before 1.0 release.\r\n\r\nMaybe a good name would be something more verbose? Since iirc the `run_cache` caches versions of the output without commiting them, a name like `output_cache`, `cache_output` or `cache_output_history` would be suitable?\r\n\r\n> Overall, we could definitely introduce run_cache: true/false for stages in dvc.yaml right now, even without corresponding CLI flag, so people could start using it. But in CLI, we could remove --no-run-cache flag in both run/repro, make --force in run/repro ignore run-cache and introduce --no-run-cache to dvc stage add, that will set run_cache: true/false flag.\r\n\r\nSo if i understand correctly, in essence the `config.yaml` would gain the `run_cache` in addition to the \"normal\" `cache` flag, which would indicate whether to save the outputs to run cache even if they are not saved to normal cache? To me this would make sense and be fine, though I would almost suggest making the run cache opt in instead of opt out. So if `cache: False` then `run_cache: False` would mimic this. For more granular control you could then specify `run_cache: True` if you were to want the run cache. Or requiring the user to do more work, you could always require specifying both `cache` and `run_cache` in the config.yaml.\r\n\r\nSorry if this comment is a bit confusing, just trying to throw some ideas around. Also when I first encountered the bug I was completely confused by the default behavior of dvc saving my 10GB tar file to cache even though I obviously specified `cache: False` to prevent this, which I think could happen to other new users as well.\r\n\n@digitalillusions Note that `run_cache: false` option is stage-level, not output-level, as not saving particular outputs to run_cache is quite a bit harder to justify, as it won't provide full \"restoration\" that way.\r\n\r\nThe reason why we have it enabled by default for `cache: false` outputs is that we had metrics files in mind, which we assume people keep in git for easier navigation without dvc. We could try to be smarter about it and only allow saving `cache: false` to run-cache if those are metrics and not just regular outputs. This makes the defaults a bit more convoluted but seems to make sense from the high-level perspective. What do you think?\n> @digitalillusions Note that run_cache: false option is stage-level, not output-level, as not saving particular outputs to run_cache is quite a bit harder to justify, as it won't provide full \"restoration\" that way.\r\n\r\n@efiop Sure that sounds sensible to me. In any case, the user could kind of control run-cache output granularity by just having dummy stages that then save respective outputs to run-cache?\r\n\r\n> The reason why we have it enabled by default for cache: false outputs is that we had metrics files in mind, which we assume people keep in git for easier navigation without dvc. We could try to be smarter about it and only allow saving cache: false to run-cache if those are metrics and not just regular outputs. This makes the defaults a bit more convoluted but seems to make sense from the high-level perspective. What do you think?\r\n\r\nI agree that this makes things too convoluted. If users have become accustomed to their outputs/ metrics being saved to run-cache even when `cache: False` so be it. Then I would suggest leaving `run-cache: True` when `cache: False` but making an exception for the metrics files seems strange to me. I just thought that opt-in to the run-cache functionality is more intuitive when disabling the basic cache. \r\n\r\nAs a different thought: How about requiring the specification of `run-cache` to True or False as soon as `cache: False` is encountered in a stage somewhere? This would require the user to make a decision, even if there is just a prompt telling them to use `run-cache: True` if they dont understand whats going on.\nGreat discussion! Sorry for being so late in replying, but there's a lot to sort through here.\r\n\r\n### Current state recap\r\n\r\nSeems like the operations of interest here are:\r\n1. Saving outputs to cache\r\n2. Restoring outputs from cache\r\n3. Saving run info to cache\r\n4. Restoring run info from cache\r\n\r\nAnd currently the way these are handled in dvc repro is:\r\n1. By default, all 4 operations are enabled on repro.\r\n2. If `dvc repro --no-run-cache` is executed, 4 is disabled.\r\n3. There is no way to disable 1, 2, or 3.\r\n\r\nLet me know if any of that is incorrect.\r\n\r\n### Thoughts/suggestions\r\n\r\n#### dvc repro options\r\n\r\nThere could be circumstances where a user wants to run a pipeline one time and only do one of restore/save. In those cases, my intuition would be:\r\n1. `dvc repro -f` should disable restoring the run or outputs.\r\n2. `dvc repro --no-commit` should disable saving the run or outputs.\r\n\r\nNeither of those seem to make sense as a consistent setup for a pipeline (there's no point in consistently performing only one of save/restore), so I think having them available only as `dvc repro` flags makes sense.\r\n\r\n#### dvc.yaml options\r\n\r\n1. The `cache` field for outputs currently is designed with small metrics-like outputs in mind. It seems that the objective is not to avoid saving or restoring these outputs (since they are small and are currently being cached anyway), but instead to keep them tracked with git. What if there were a `git` or `gitignore` flag that determined whether those files are put into `.gitignore` but not whether they are cached? \r\n2. For a use case like a non-deterministic stage, users may want to consistently not save/restore runs, so a stage-level field like `run-cache: false` (or better named alternative) field in `dvc.yaml` makes sense to disable both saving and restoring runs.\r\n3. What if the stage-level field was `cache` just like the field for individual outputs? This would set the default `cache` value for all outputs under that stage and control whether the runs get cached. Then, users could still opt in/out of caching individual outputs for that stage. If the stage is `cache: true` and the output is `cache: false`, dvc could warn that the stage will not be able to be restored (or even prompt users before proceeding like suggested above).\n> 1. run-cache name adds to the confusion with our regular local cache\r\n> a name like output_cache, cache_output or cache_output_history would be suitable?\r\n\r\nI've been explaining it as \"log of stage runs\". For ex. see https://dvc.org/doc/user-guide/project-structure/internal-files#run-cache. It seems like more of a registry or log to me (part of the project cache, but not a cache on it's own).\r\n\r\n> 2. `run_cache: true/false` for dvc.yaml\r\n\r\n@efiop I'm not sure it's needed. I also think that a `cache: false` out should deactivate logging runs of that parent stage: No point in having the run signature and dvc.lock saved without **all** of the outputs cached. (I didn't get how metrics/plots change this logic, BTW.)\r\n\r\n> 3. current `--no-run-cache` is actually `--no-restore-run-cache`\r\n> make` --force` in `run/repro` ignore run-cache and introduce `--no-run-cache` to `dvc stage add`\r\n\r\nI agree that `repro --force` should include not restoring from cache 👍.\r\n~~But what about preventing `repro/run` from logging runs (if the stage doesn't have `cache: false`) ? I'd consider keeping `--no-run-cahce` for that case (+ make it include `-f`).~~ Edit: **dberenbaum**'s suggestion is better.\r\nAdding it to `dvc stage add` makes sense too 👍.\n> There is no way to disable 1, 2, or 3.\r\n\r\n@dberenbaum there's `--no-commit` for 1 in (as you later mention). And 4 already causes 2 🙂 \r\n\r\n> circumstances where a user wants to run a pipeline one time and only do one of restore/save\r\n\r\nHm... you mean only restore/save missing stage outputs? But some stage outputs may invalidate others. Plain `repro` already does all those checks (`-f` is only for very special situations I think). And if you only want to restore missing outputs, you can use `dvc checkout`. Maybe I didn't get the idea correctly.\r\n\r\n> `dvc repro --no-commit` should disable saving the run or outputs.\r\n\r\nI like that actually! No need for `--no-run-cache` in `repro` (simple=better). Unless we think users could want to cache outputs (e.g. to push them to remote storage) yet **not** log the run for some reason (can't think of one).\r\n\r\n> dvc.yaml options\r\n\r\n1. I think `cache: false` in dvc.yaml has a more general purpose but I'm not sure what the original intention was. Interesting idea about a `git: false` field, although I incline towards keeping the schema simpler if possible. But maybe rename `cache` to `commit` (as in `run --no-commit`) — somewhat unrelated here.\r\n2. Good point. I still think `cache/commit :false` is enough, but also see no problem in adding it to the stage level (3. whatever name is used).\n> I've been explaining it as \"log of stage runs\". For ex. see https://dvc.org/doc/user-guide/project-structure/internal-files#run-cache. It seems like more of a registry or log to me (part of the project cache, but not a cache on it's own).\r\n\r\nI like this.\r\n\r\n> @dberenbaum there's `--no-commit` for 1 in (as you later mention).\r\n\r\nI would think so, but that's not how it behaves now. Try the example in https://github.com/iterative/dvc/issues/4428#issuecomment-741618372 and add `--no-commit`, and you will still see `hello.txt` saved to the cache!\r\n\r\n> * I think `cache: false` in dvc.yaml has a more general purpose but I'm not sure what the original intention was. Interesting idea about a `git: false` field, although I incline towards keeping the schema simpler if possible. But maybe rename `cache` to `commit` (as in `run --no-commit`) — somewhat unrelated here.\r\n> \r\n> * Good point. I still think `cache/commit :false` is enough, but also see no problem in adding it to the stage level (3. whatever name is used).\r\n\r\nYou seem to be suggesting what @digitalillusions suggested (disable run-cache if any output has `cache: false`), which seems like a sensible default if wanting to keep the interface as simple as possible but provides a little less flexibility.\r\n\r\nFor metrics, users may want to cache the results with dvc so that they are tied to a particular dvc run, but they may also want to keep them tracked with git so that it's easy to see results without dvc (for example, browsing in Github). For use cases like the original one in this issue, users may want dvc to visualize their entire process without actually caching certain outputs, but they may also want to ignore those outputs in git since they would be way too big for git. These could both probably be accomplished by manually updating `.gitignore`, but that seems clunky.\r\n\r\nSeems like there are at least 2 viable options, both of which are likely preferable to the current state. @efiop Interested in your thoughts when you have a chance.\n> that's not how it behaves now\r\n\r\nI see. But that looks like a bug which should be fixed soon (hopefully).\r\n\r\n> suggesting what **digitalillusions** suggested (disable run-cache if any output has cache: false\r\n\r\nYes. I see no point in logging a run with incomplete outputs in cache.\r\n\r\n> they may also want to keep them tracked with git so that it's easy to see results without dvc (for example, browsing in Github\r\n\r\nOK I could see that although it's a kind of specific use case (are there user requests along this line?) We do have `dvc list` for this and perhaps another \"bun in the oven\"? 😉\nGood points, @jorgeorpinel , and I think disabling the `run-cache` if any output has `cache: false` is less disruptive for existing workflows than changing the syntax, so I'm fine with that suggestion as long as others don't have concerns. I'd be interested in feedback from @digitalillusions if you are still paying attention!\n@dberenbaum I'm still here and paying close attention! I would be very happy with a solution which disables the `run-cache` if `cache: False`, since this addresses my original issue and is is my opinion the most intuitive default behavior. I guess the `--no-commit` thing is a different issue?\r\n\r\nEspecially when using large datasets which can be downloaded and dont want to be kept in dvc cache, the `-O` option should not suddenly start saving these files to `run-cache`. Of course you could argue that these dont need to be part of pipeline inputs and outputs, but the dvc mechanism still works great for versioning these large datasets even if they are not present in the cache.\r\n\r\nWould the current consensus be to add a stage level `run-cache` option which saves all outputs to `run-cache` if `run-cache: True` even if there are `cache: False` in the `dvc.yaml` file? The default behavior would be `run-cache: False`, as mentioned above, as soon as `cache: False` for any output? With this the choice for run cache would be all outputs or no outputs. This would also be the behavior that makes the most sense, given that the `run-cache` can be used to restore the entire state of a specific stage, instead of allowing the user to only save some outputs to `run-cache`. Did I get this right?\nYes, the default would be to disable the run cache if `cache: false` for any output. I don't know that a stage-level `run-cache` is needed. If `cache: true` for all outputs, I don't think there's any reason not to cache the run, and if `cache: false` for any output, I don't think there's any reason to cache the run.\r\n\r\nFor anyone using `cache: false` on metrics-like outputs, they likely assume that those metrics outputs are not being cached by DVC, so I don't think there's much harm in disabling the run cache. It might be nice to give the option to have DVC cache those outputs and runs yet still have them tracked by git, but it seems like the consensus is that the added complexity of doing so may not be worthwhile.\nSo to summarize all changes being proposed, the above comment explains the suggested behavior for the `cache` option in `dvc.yaml`.\r\n\r\nThe other suggested changes are:\r\n\r\n> * `dvc repro -f` should disable restoring the run or outputs.\r\n> \r\n> * `dvc repro --no-commit` should disable saving the run or outputs.\nIf `cache: false` is set because some data is sensitive, current behavior could be dangerous. If someone does `dvc push --run-cache`, for example, they will push the `cache: false` data to the remote.\nHi and have a good day!\r\n\r\nI've stumbled upon a weird behavior related to this issue.\r\n\r\nConsider this dvc.yaml:\r\n```\r\nstages:\r\n first:\r\n cmd: echo \"1\" | tee 1.txt\r\n outs:\r\n - 1.txt:\r\n cache: false\r\n```\r\nIn this case, everything works well: local cache is empty.\r\n\r\nHowever, if I added more stages dependent on the previous ones:\r\n```\r\nstages:\r\n first:\r\n cmd: echo \"1\" | tee 1.txt\r\n outs:\r\n - 1.txt:\r\n cache: false\r\n second:\r\n cmd: echo \"22\" | tee 2.txt\r\n deps:\r\n - 1.txt\r\n outs:\r\n - 2.txt:\r\n cache: false\r\n third:\r\n cmd: echo \"333\" | tee 3.txt\r\n deps:\r\n - 2.txt\r\n outs:\r\n - 3.txt:\r\n cache: false\r\n```\r\n\r\nI got files related to the second and the third stages in the local cache along with the 'runs' folder. Why is it like this? Is a proper behavior or a bug? As far as I learned from this thread, it shouldn't be like this.\nHello @GlaIZier! I am afraid that you are right, in this case `--no-run-cache` option added to `repro` should disable the run cache but it does not (as in example I posted some time ago: https://github.com/iterative/dvc/issues/4428#issuecomment-741618372) We still didn't found time to get to this bug. How severe it is to you? \n@pared For the first stage above, is the run cache not triggered because there are no dependencies?\nUnfortunately, we haven't gotten to this one for a long time. I'm lowering the priority, and hopefully we will get back to this when we start refactoring pipeline/stage code.\n@dberenbaum \r\n> @pared For the first stage above, is the run cache not triggered because there are no dependencies?\r\n\r\nYes, I noticed this while creating an example for #8582.\nHI everybody, I just found out this behavior while trying to work on a pipeline that should handle sensitive data, and it has become a mild headache. \r\n\r\nIn my use case. I run a dvc pipeline where the first step that fetches data from a db, and the next steps run some analysis on the fetched data. The results of the analysis can be cached and then pushed to dvc remotes, but the source data should under no circumstance exit the local machine in which they have been queried. I thought that setting `cache: false` for the output of the fetching step was enough to prevent dvc from caching, but I keep finding them in `.dvc/cache` after running `dvc repro`. This makes me very uneasy in running `dvc push` as I might unintentionally be contributing to a data leak. Do you happen to have a way to handle such scenario?\r\n\r\nPS: I thought to remove the queried data from the outputs of the fetching step, but that would make my pipeline a bunch of unconnected steps. Feasible but sub-optimal given dvc usefulness in handling data flows.\n> Do you happen to have a way to handle such scenario?\r\n\r\nHi @davide-chiuchiu, we are discussing solutions for handling `cache: fasle` on a draft P.R. here: https://github.com/iterative/dvc/pull/8738 . \r\n\n> > Do you happen to have a way to handle such scenario?\r\n> \r\n> Hi @davide-chiuchiu, we are discussing solutions for handling `cache: fasle` on a draft P.R. here: #8738 .\r\n\r\nThat looks very useful. I will track it to known when we can use it. Thank you!\r\n":1,"Thanks for reporting, please can you provide a self contained example that shows the error.\nI am experiencing the same, references that would've previously been carried through a hierarchy of types now get broken during validation. I will try to put together a repro and suggest changes to maintain the prior functionality \nhttps://github.com/samuelcolvin/pydantic/pull/3642/commits/ae408326e70d84510a8e25e8f6a6ae8871df2fd0\nhere is a fine repro:\r\nhttps://github.com/PrettyWood/pydantic/blob/ae408326e70d84510a8e25e8f6a6ae8871df2fd0/tests/test_main.py#L1564\r\n\r\nThat line was changed from `is` to `is not`. This is a breaking change in functionality\nWell that's not the same as the error shown above, that's just a change in behaviour.\nsure, but its a breaking change in behavior. ":1,"> Make sure only the table is presented in STDOUT. All other messages (like \"No changes.\") should be in STDERR.\r\n\r\nNot sure why it should be like that. Table as well as `No changes.` are for the user, not really meant to be parsable. For parsing we have `--show-json`. I don't think we do that anywhere else in the dvc.\nI'd prefer to have an empty output in this case. No need in a special message. It is a usual approach for many commands including `git diff`.\n@dmpetrov But we've been talking about dvc commands being too silent, hence why we've introduced such summary messages everywhere. `No changes` is consistent here with the rest of the commands.\nDon't have a strong opinion on this (`git diff` does not show anything, right? but on the other hand it outputs patch by default and DVC outputs some human-readable table - so not a direct comparison for sure).\r\n\r\nIt's better to be consistent with other DVC \"diff\" commands though.\n@dmpetrov noticed that it makes it not possible to use `dvc metrics diff` in shell like `[ -z \"dvc metrics diff ^HEAD\" ]` which is bad. Moving to stderr, makes total sense to me now.\nAlso probably time to use `print` there instead of `logger.info`...\n@efiop do we have the same problem (not sure though why --json could not be used for example in the same bash check) for other commands? again, just to make sure that we are consistent more or less\nAll the \"information\" commands need output nothing if there no information. This way you can easily use them from scripts like\r\n```\r\n$ git diff\r\n$ if [[ -z `git diff`]]; then \r\n # do something\r\nfi\r\n```\r\nOtherwise, we are pushing people to parse the outputs - `if [[ 'dvc metrics diff' = \"No changes\" ]]`. Clear anti-pattern.\r\n\r\nFor \"action\" commands (not \"information\") like `dvc checkout` it is fine (and usually preferable) to output human-readable information.\nWould you consider `git status` an information or action command? :)\nI really think that the reason behind `git diff` is that it's not meant to be consumed by a human even if there are some changes in the first place. `git diff` with its default options is similar to `dvc diff --json`.":1,"not only commit/add, some action like 'dvc move' would not count desc/remote in as well. It seems we cannot add remote and desc into dvc file currently. \r\n@skshetry how about updating the doc in https://dvc.org/doc/user-guide/project-structure/dvc-files#output-entries\nWe try to preserve the data for meta and desc here, but we did not do that for `remote`.\r\n\r\nhttps://github.com/iterative/dvc/blob/30d6839a5f471fb02a7a2dcbd6a6616b71277762/dvc/stage/__init__.py#L116-L119\r\n\r\nThe `remote` can be accessed from `out.remote`, and can be set to the new stage that we are creating, as we do for `desc`.\r\n\r\n---\r\n\r\nFor the `move`, it's going to be a bit more complicated, but involves the same thing that we do above.\r\n\r\n\nHey DVC team! Wondering whether there is an ETA on this issue or if not, whether I can take a stab at a fix? I am working with a setup where I require per-dvc-file remote outputs and this bug is making it infeasible to update (and push) ml model files to dvc remotes when conducting model training on Gitlab runners.":1,"Thanks @rubenpraets for the great research, this is an issue in `adlfs` where it should be fixed.\r\n\r\nSee https://github.com/fsspec/adlfs/blob/master/adlfs/spec.py#L285-L300 (it even refers to the issue you mentioned 🤷🏼).\r\n\r\n":1,"Yes, I would.\r\n\r\nOne concern: you might need to wrap the regex in a function to avoid increasing module import time, same as we do for other regexes.":1,"Very good catch, thank you @DetachHead.":1,"I'm not sure what the correct behaviour would be here?\r\n\r\nSince the model is self referencing, the schema surely is infinitely recursive?\r\n\r\n@tiangolo do you have an idea about what to do here? Maybe just a more constructive error.\nYes, it should be able to create the JSON Schema, assign an ID to it and then reference it with `$ref`. Here's the relevant section in the spec: http://json-schema.org/latest/json-schema-core.html#rfc.section.8.3\r\n\r\nI'll try to fix it as soon as I get a chance.\nAwesome, thank you. I think you're the best person to do it since you understand schema best.":1,"You can resolve this by removing the extra `@dataclasses.dataclass`.\r\n\r\nMight have similar origin to #4907.\nI applied both decorators to shorten the example. In my actual code I can't remove the extra `dataclass` because I have the following situation:\r\n\r\n```\r\n# can't change this definition\r\n@dataclasses.dataclass\r\nclass ValueObj:\r\n name: str\r\n\r\n\r\n# IO module\r\nValueObj = pydantic.dataclasses.dataclass(domain.ValueObj)\r\n```\r\n\r\nP.S. Your response time is impressive!\nThat was luck, often it's not so good. :-)\n\nAs mentioned on the linked issue, the current dataclass support is very\ninvolved, most of our bug fixes have been related to trying to patch\ndataclass edge cases.\n\nI'd strongly prefer not to change dataclass support again in v1, but\nhopefully we can fix this properly in v2.\n\nUnless we can find a trivial solution.\n\n\nOn Fri, 13 Jan 2023, 16:34 mbillingr, ***@***.***> wrote:\n\n> I applied both decorators to shorten the example. In my actual code I\n> can't remove the extra dataclass because I have the following situation:\n>\n> # can't change this definition\n> @dataclasses.dataclass\n> class ValueObj:\n> name: str\n>\n>\n> # IO module\n> ValueObj = pydantic.dataclasses.dataclass(domain.ValueObj)\n>\n> P.S. Your response time is impressive!\n>\n> —\n> Reply to this email directly, view it on GitHub\n> ,\n> or unsubscribe\n> \n> .\n> You are receiving this because you commented.Message ID:\n> ***@***.***>\n>\n\nI can understand that you don't feel the urge to touch the dataclass support in v1.\r\n\r\nFor me it's already a win to know that this is really a bug and not just me misusing your API. If it can't be fixed upstream I'll find a workaround. (Even though I'm not particularly fond of the idea, it should be easy to just duplicate the `ValueObj` definition.)\r\n\r\nStarting Monday, I could free some time to look into this in more detail. Would you accept a pull request if I managed to find a simple fix? (I don't expect to, but you never know... :))\nPossibly, it's really up to @PrettyWood who is the \"master of dataclasses\".\nI dug deeper and found that the recursion occurs while deep-copying a `DataclassProxy`.\r\nAt some point Python's `copy._reconstruct` function creates a new uninitialized `DataclassProxy`, then checks if this has a `__setstate__` attribute.\r\n`DataclassProxy.__getattr__` wants to delegate the attribute access to it's `__dataclass__` field, but being uninitialized, this field does not exist and looking it up invokes `DataclassProxy.__getattr__` again...\r\n\r\nI think this problem could be solved by adding a `__deepcopy__` method to `DataclassProxy`:\r\n\r\n```python\r\nclass DataclassProxy:\r\n\r\n # ...\r\n\r\n def __deepcopy__(self, memo: Any) -> \"DataclassProxy\":\r\n return DataclassProxy(deepcopy(self.__dataclass__, memo))\r\n```\r\n\r\nThis seems to fix my example above (I did not check if it breaks anything else, though).\nYup @mbillingr ! Seems like the right fix 👍":1,"Should this also include the option for `quote_plus` in case it's needed for compatibility reasons?\nHi @kkirsche!\r\n\r\nSorry I'm not following, what are the compatibility reasons?\r\n\nNot all APIs, in my experience at least, support percent-encoded spaces (`%20` instead of ` `). Some, but not all, only accept plus-variants (`+` instead of ` `) of the space encodings, requiring the use of `quote_plus` instead of `quote`.\nYeah sure I think this should be included.\r\n":1,"Hi @yobiscus \r\nI feel like the issue is just related to the check done in literal where `'fiz' in {}` is `True`.\r\nWe could maybe do something like\r\n```diff\r\n def make_literal_validator(type_: Any) -> Callable[[Any], Any]:\r\n permitted_choices = all_literal_values(type_)\r\n- allowed_choices_set = set(permitted_choices)\r\n\r\n def literal_validator(v: Any) -> Any:\r\n- if v not in allowed_choices_set:\r\n+ for x in permitted_choices:\r\n+ if x == v:\r\n+ return x\r\n+ else:\r\n raise errors.WrongConstantError(given=v, permitted=permitted_choices)\r\n- return v\r\n\r\n return literal_validator\r\n```\r\n to return the original value in `Literal` instead of the passed one but that would cost a bit of performance. There may be a better solution that's just the first one that came in mind.\nI see, thanks. This now makes sense given the logic. Now that I've had time to digest this some more, I feel like this is a bug in Pydantic (especially because the field is identified by mypy as an enum field rather than a string).\r\n\r\nDo you think any other types are subject to this issue? My guess is that this behaviour is unusual and specific to Enums because `\"fiz\" == Bar.FIZ` evaluates to `True` even though `isinstance(\"fiz\", Bar)` evaluates to `False`.\r\n\r\nI would be happy to look more closely at a solution for this problem, but I am worried about breaking backwards compatibility in a 1.X release, so I'm also wondering what the recommended direction is for this issue.":1,"This is a side effect of how workspace experiment runs work. As a part of the various git operations that happen during an experiment run, `HEAD` gets moved around. At this particular point in time it will be a detached HEAD pointing to the current \"checkpoint\" commit.\r\n\r\nBy default, `dvc exp show` only shows experiments derived from (branched off of) the `HEAD`. So when HEAD is in this intermediate detached state, there are no additional experiment commits/branches that fit the criteria to be displayed.\r\n\r\nSo basically the issue is that `exp show` is not intended to be used in this way (during a run).\nInternally we do know where the original `HEAD` points to (since we need to restore it after the run finishes). If `exp show` is used mid-run in this way, we can output the table with respect to that original HEAD.\r\n\r\nI think this `exp show` change will be non-trivial though, making `exp show` work properly during execution will likely require adjusting how our repo lock works (related: https://github.com/iterative/dvc/issues/5739, https://github.com/iterative/dvc/issues/3783), and it seems like there's some potential for git-related race conditions that will need to be accounted for as well.\n@pmrowla \r\n\r\nThanks a lot for explaining this 🙏 This issue (and the locks one) feel like very important ones from the VS code extension perspective. \r\n\r\n> This is a side effect of how workspace experiment runs work. As a part of the various git operations that happen during an experiment run, HEAD gets moved around. At this particular point in time it will be a detached HEAD pointing to the current \"checkpoint\" commit.\r\n\r\ncould you please elaborate a bit more on this? I guess describe (or point us) into how `workspace experiment runs` exactly \r\nwork. It's a bit hard for me to \"connect the dots\" for the description.\r\n\r\n> So basically the issue is that exp show is not intended to be used in this way (during a run).\r\n\r\nis DVC supposed to be locked? how is it possible that we can `dvc exp show` at all in this case?\r\n\n> could you please elaborate a bit more on this? I guess describe (or point us) into how `workspace experiment runs` exactly\r\n> work. It's a bit hard for me to \"connect the dots\" for the description.\r\n\r\n(checkpoint) experiment runs work the same as a typical DVC workflow like:\r\n\r\n```\r\n# HEAD points to some commit in `master`\r\n$ dvc repro\r\n$ git add -A\r\n$ git commit\r\n# HEAD now points to the new commit\r\n$ dvc repro\r\n$ git add -A\r\n$ git commit\r\n# HEAD now points to the new commit\r\n...\r\n```\r\n\r\nExcept that the commits we make are contained in experiment refs as opposed to a regular git branch (like `master`). While we are doing these git operations, git `HEAD` is still moved with each new experiment commit, in the same way that HEAD moves when you add a commit to a regular branch.\r\n\r\nAfter the experiment run finishes, we restore HEAD to the user's initial commit.\r\n\r\nNote that this is specific to workspace runs - in experiments, we also support the `--queue`/`--temp` runs where execution happens in a completely separate temporary directory environment, in this case the git HEAD for the users workspace would never change.\r\n\r\n> is DVC supposed to be locked? how is it possible that we can `dvc exp show` at all in this case?\r\n\r\nThe repo gets unlocked during `repro`/`exp run` when executing users stage commands, to allow for read-only commands to be run. This works fine for the usual `dvc repro` use case, but clearly needs to be revisited for experiments since we now modify the git repo state by moving HEAD. (`exp show` is the obvious example of why it's an issue, but this would also affect params/metrics diff commands that default to diffing against HEAD)\nThanks @pmrowla \r\n\r\n> After the experiment run finishes, we restore HEAD to the user's initial commit.\r\n\r\njust clarify, does it mean that we also do `dvc exp apply` at the end?\r\n\r\n> making exp show work properly during execution will likely require adjusting how our repo lock works \r\n\r\nwhat is your take on this? it seems that `dvc exp show` is read-only ... not clear immediately why do we need any changes to the existing locking mechanism to be honest in this case (clearly, we might need some additional locks to prevent Git race conditions, etc)\n@shcheklein \r\n\r\n> just clarify, does it mean that we also do `dvc exp apply` at the end?\r\n\r\nFor workspace runs yes, the end result in the workspace will contain the original HEAD with the changes from the experiment run. Technically, we don't actually run apply, we just do `git reset ` (but the end result is equivalent to what the user would get with `dvc exp apply`).\r\n\r\nFor non-workspace runs (`--temp` or `--queue`+`--run-all`), the changes for each experiment are not applied to the workspace at all, and a user must manually run `dvc exp apply` if they actually want to see the changes in their workspace.\r\n\r\n> > making exp show work properly during execution will likely require adjusting how our repo lock works\r\n> \r\n> what is your take on this? it seems that `dvc exp show` is read-only ... not clear immediately why do we need any changes to the existing locking mechanism to be honest in this case (clearly, we might need some additional locks to prevent Git race conditions, etc)\r\n\r\nThe existing locking mechanism works, but as you noticed it doesn't handle potential git race conditions with regard to experiments, which is what I was getting at w/that comment.\nOne other consideration mentioned by @pmrowla: similar issues may be found in the `metrics` and `plots` commands.\r\n\r\n@rogermparent There's no timeline for this yet, and it might not be a quick fix, but it's on the dvc backlog, and you can track discussions here and any progress in the linked projects.":1,"It seems there are two problems, the first one is what you mentioned in the issue, which aparently can be solved by using the legacy types in Typing. I believe that is problematic since PEP 585 was supposed to make list and List equal(at least from my understanding). \r\n\r\n```\r\nfrom typing import TypedDict, List\r\n\r\nfrom pydantic import BaseModel\r\n\r\n\r\nclass A(TypedDict):\r\n a: List['A']\r\n\r\n\r\nclass B(BaseModel):\r\n a: A\r\n```\r\n\r\nThe problem with this code now becomes a maximum recursion depth. But that's a completly different problem. \r\n```\r\n...\r\n File \"/home/luccas/Projetos/pydantic/pydantic/typing.py\", line 355, in is_literal_type\r\n return Literal is not None and get_origin(type_) is Literal\r\n File \"/home/luccas/Projetos/pydantic/pydantic/typing.py\", line 124, in get_origin\r\n return _typing_get_origin(tp) or getattr(tp, '__origin__', None)\r\n File \"/usr/lib/python3.9/typing.py\", line 1510, in get_origin\r\n if isinstance(tp, (_BaseGenericAlias, GenericAlias)):\r\nRecursionError: maximum recursion depth exceeded in __instancecheck__\r\n```\r\nThis for example works\r\n```\r\nfrom typing import TypedDict, List\r\nfrom pydantic import BaseModel\r\n\r\n\r\nclass A(TypedDict):\r\n foo: int\r\n bar: str\r\n\r\n\r\nclass B(BaseModel):\r\n a: List['A']\r\n```\r\n\r\nOutput of python -c \"import pydantic.utils; print(pydantic.utils.version_info())\":\r\n\r\n```\r\n pydantic version: 1.8.2\r\n pydantic compiled: False\r\n install path: /home/luccas/Projetos/pydantic/pydantic\r\n python version: 3.9.7 (default, Aug 31 2021, 13:28:12) [GCC 11.1.0]\r\n platform: Linux-5.4.148-1-MANJARO-x86_64-with-glibc2.33\r\n optional deps. installed: ['devtools', 'dotenv', 'email-validator', 'typing-extensions']\r\n\r\n\r\n```\r\n":1,"@skshetry, I tag you because AFAIK you work with yaml in DVC a lot :)\n1. We have discussed this before. It's very opinionated to assume it to be `--flag=value`. What if some user wants it in `json` to pass to `jq` for example? So, it's hard to make this decision for the users.\r\n\r\n2. Could you please create a separate issue for this? It's an `experiments` related issue, stemming from the checks here:\r\nhttps://github.com/iterative/dvc/blob/eb46c03c6c02e837c09d76cc3c96c889a84bafe8/dvc/utils/cli_parse.py#L36-L38\r\n\r\nNote that the set-params are not the same as parametrized variables. They just happen to use `params.yaml` as a default.\r\n\r\n> And experiment could be run, but “None” value will be used\r\n\r\nWhat should the correct behavior be? What you are specifying there is a null value as per yaml/json terms. There can be questions about how to represent it though.\r\nThe unambiguous thing to do is to set empty-strings `''`. \r\n\r\n3. There were a few discussions on supporting lists on `cmd`. But we did not implement it because there might be different representations of the list that the user might need (comma-separated, space-separated, python's list repr, etc), and I did not want to make `cmd` be a special case (you can use parametrization anywhere). 🙂 \r\n\r\n\r\n\n@aguschin Have you tried to search through past issues and discussions for context?\r\n\r\n@skshetry Are there past issues or discussions that you could provide for context? I can try to find some, but I thought you might be more familiar.\r\n\r\nFor example, AFAIK, the current templating was an intentional choice to add some limited flexibility without the complexity of a full templating language or python API. Similarly, I think there are past discussions about how to automatically detect dependencies (like parameters) and avoid duplication.\nInteresting point about passing params to a script. \r\n\r\n> We have discussed this before. It's very opinionated to assume it to be --flag=value. What if some user wants it in json to pass to jq for example? So, it's hard to make this decision for the users.\r\n\r\nI think we still should till try to analyze how common for DVC users it would be (vs `json to jq` which is quite artificial compared to YOLO5 repo). It might turn out that but giving this option (not making it default) we can simplify a lot of ML scenarios.\nI might be missing some context (although I have been reading other related issues) but I think that maybe this specific issue could be addressed within `dvclive` instead of (or in addition to) trying to find a solution as part of `dvc params`. \r\n\r\nTo elaborate a bit:\r\n\r\nThe problem seems to be a good candidate to be solved with a python API and `dvclive` is a separate library focused on providing Python APIs so it doesn't have the \"restrictions\" of being language agnostic, like it is the case for `dvc`. \r\n\r\nIn addition, it looks like the issue could be quite common in the training stages of a *ML Scenario* while also being, at the low level, different depending on the *ML repository/framework* used. \r\n\r\nIn this case `Yolov5` uses `argparse` but other ML repositories/frameworks could use other options or even custom configuration files like it is the case for [detectron2](https://github.com/facebookresearch/detectron2) or [mmdetection](https://github.com/open-mmlab/mmdetection), just to give examples of frameworks focused on object detection models.\r\n\r\nSo, given that `dvclive` is intended to eventually [further expand it's integrations](https://github.com/iterative/dvclive#call-to-collaboration) with *ML frameworks/repositories*, maybe this `dvc params`<>`training args` link could be solved as part of each individual `dvclive<>ML framework/repository` integration (i.e. in this case a `dvclive<>yolov5`)? Does this make sense?\r\n\nThread on discord related (to some extent) :\r\n\r\nhttps://discordapp.com/channels/485586884165107732/563406153334128681/865257349555027969\nThe full command (including command line arguments) are already part of the stage dependencies. Maybe we could look into parsing and showing the arguments (or at least the full command) as part of `dvc exp show`? These could potentially be seen as either implicit parameters or another type of dependency.\r\n\r\nEdit: To further explain, if we had better support for showing the command line arguments as dependencies, it wouldn't be necessary to also list these same values in the params file.\nAnother idea: any templated values in the command (anything using `${}` syntax) could be automatically included as parameters. This at least avoids having to repeat values in `cmd` and `params` in `dvc.yaml`.\n@dberenbaum, templated values are automatically included in `params show/diff`/`exp show` results.\r\n```\r\n# custom-params.yaml\r\nepochs: 100\r\nseed: 20170428\r\n\r\n# dvc.yaml\r\nvars:\r\n- custom-params.yaml\r\nstages:\r\n stage1:\r\n cmd: ./script.py --epochs ${epochs}\r\n```\r\n\r\n```console\r\n$ dvc exp show --md --no-pager\r\n| Experiment | Created | epochs |\r\n|--------------|-----------|----------|\r\n| workspace | - | 100 |\r\n| master | 11:00 AM | 100 |\r\n\r\n$ python -c 'from dvc.repo import Repo; print(Repo().params.show())'\r\n{'': {'data': defaultdict(, {'custom-params.yaml': {'data': {'epochs': 100}}})}}\nIf I can proffer another potential solution, if DVC could specify a format for not only the dvc.yaml but also yaml files for the `-d` and `-p ` arguments for `dvc run`. That way, quite complex dependencies and parameters could be created with utility functions by the helper classes/scripts, and re-used for individual stages, without having to create extremely verbose dvc.yaml files.\nI think it also should support a simple array like this:\r\n(Similar to `func(*[a,b,c,d])` in python or `[...array, new_time, new_item2]` in js.\r\n\r\n> When we run `foreach .. do ...` for items in an array inside `dvc.yaml` , we might want to join results of each `do` into one. It would be nice to be able to unroll the array instead of adding each item separately.\r\n> \r\n> Now I do this:\r\n> \r\n> ```\r\n> vars:\r\n> - datasets:\r\n> - one\r\n> - two\r\n> - three\r\n> \r\n> stages:\r\n> prep:\r\n> foreach: ${datasets}\r\n> do:\r\n> cmd: python main.py prep ${item}\r\n> outs:\r\n> - data/processed/{item}\r\n> join:\r\n> cmd: python main.py merge ${datasets[0]} ${datasets[1]} ${datasets[2]}\r\n> deps:\r\n> - data/processed/${datasets[0]}\r\n> - data/processed/${datasets[1]}\r\n> - data/processed/${datasets[2]}\r\n> ```\r\n> \r\n> Obviously this leads to errors when we forget to update `join` stage after updating `datasets` variable.\r\n> \r\n> We can have an option to unroll an array like this:\r\n> \r\n> ```\r\n> join:\r\n> cmd: python main.py merge ${...datasets}\r\n> deps:\r\n> - data/processed/\r\n> ```\r\n\r\n\nThanks, @Rusteam! Why do you change `deps` between your two examples? Is your data dependency the entire `data/processed/` directory or only the specified dataset paths? Your request may also be related to #7151 if you need to specify each dataset dependency independently.\nwell, it should only be the specified paths but I don't see how can I do it without listing each of them separately (unless i create another dir `data/processed/dataset`) and put all three there.":1,"> Would it be possible?\r\n\r\nThe internal API already supports multiple `revs`.\r\n\r\nThis should be a simple change to make for the CLI (TBH I thought the CLI already supported it)":1,"I can confirm the behaviour, @PrettyWood can you look at this?":1,"We could simply set `no_traverse = False` in `RemoteHTTP.__init__` permanently, \nThrow an exception if no_traverse is set for HTTP\nAdd test for this\n@efiop , does it make sense to raise an exception? what about defaulting to `traverse`?\r\nJust setting `self.no_traverse = False` on the `RemoteHTTP.__init__` should work as intended.\n@mroutis But in that case setting that option in config will have no affect on it and user won't even know that it is not working.\n@efiop , as @pared noticed, `list_cache_paths` is not implemented for `RemoteHTTP` (neither `gc`). I'm wondering how `HTTP` was used as a cache :thinking: \n@mroutis it is used through no_traverse and has been that way always. gc is not implemented because HTTP doesn't support write, http has been always used as read-only(i.e. pull/fetch only).\n@efiop , but what are you going to pull if you haven't `push`ed anything?\n@mroutis You could push through s3 and then pull through http, as we've been doing in dvc for a long time already https://github.com/iterative/dvc/blob/master/.dvc/config#L2\nYep, the same we do with `example-get-started` - `dvc remote add --local s3` to push and `dvc remote add http` to then expose it to public as a read-only data repo.":1,"@helger Could you also show us your `$ dvc version` output, please?\n> @helger Could you also show us your `$ dvc version` output, please?\r\n\r\n```\r\n dvc version\r\nDVC version: 0.90.2\r\nPython version: 3.7.4\r\nPlatform: Linux-4.4.0-1104-aws-x86_64-with-debian-stretch-sid\r\nBinary: False\r\nPackage: pip\r\nSupported remotes: azure, gs, hdfs, http, https, s3, ssh, oss\r\nFilesystem type (workspace): ('ext4', '/dev/xvda1')\r\n```\n> > @helger Could you also show us your `$ dvc version` output, please?\r\n> \r\n> ```\r\n> dvc version\r\n> DVC version: 0.90.2\r\n> Python version: 3.7.4\r\n> Platform: Linux-4.4.0-1104-aws-x86_64-with-debian-stretch-sid\r\n> Binary: False\r\n> Package: pip\r\n> Supported remotes: azure, gs, hdfs, http, https, s3, ssh, oss\r\n> Filesystem type (workspace): ('ext4', '/dev/xvda1')\r\n> ```\r\n\r\n\nOutput of `pip freeze`\r\n\r\n[pip_freeze.txt](https://github.com/iterative/dvc/files/4370733/pip_freeze.txt)\nDiscord context https://discordapp.com/channels/485586884165107732/485596304961962003/691688363291312139\nThis happens because we try to create parent when trying to link from cache to workspace (and, here, parent of `s3:///` is `\"\"`, i.e. empty).\r\nhttps://github.com/iterative/dvc/blob/ee26afe65e8f9ebf11d7236fd3ee16a47f9b4fc6/dvc/remote/base.py#L380-L385\r\n\r\nIf the file is in `s3:////`, this won't fail.\r\n\r\nI don't think, we need to create parent directories for object-based storages except when checking out directory.\r\n\r\nGoogle Cloud Storage should equally be affected here as it's the same logic.\n@skshetry indeed adding another level fixes the issue\n@skshetry Great catch! :pray: In general we do need to create those, because s3 and s3 tools sometimes create dirs like that, it was discussed in https://github.com/iterative/dvc/pull/2683 . We don't need-need to do that, but it is a compromise to handle both approaches. But we definitely need to handle this corner case better.\n@efiop, it depends on how you see it. We can handle this corner case, but, there's no need for us to create a directory in most of the cases (except of #2678 cases?).\r\n\r\ni.e. `dvc add s3://dvc-bucket/data/file` should not even try to create `s3://dvc-bucket/data/` as a directory.":1,"happy to accept a PR to fix this.\nJust to clarify, is any length between 13 and 19 digits inclusive allowed? Or just 13, 16, or 19 digits?\nAFAIU it's not inclusive. Did some research and this formatting [website](https://www.freeformatter.com/credit-card-number-generator-validator.html#cardFormats) came up.\r\n\r\nLet me ask you something about implementation. We may create subtypes following faker's approach (`visa13`, `visa19`, `visa16`). In my opinion, we shouldn't replace `visa` in favor of `visa16` as it's going to break. Let's keep the non explicit `visa` brand ? Any thoughts about this ?\nI'm opposed to having multiple types. We should have just one card type, people can subclass that or add validators to constrain types more if they wish.":1,"I am also very interested in this question, as in many cases in my code I *know* the values are correct and don't require validation. It would also be nice to have an API for initializing a model instance from known-valid inputs without needing to go through the various alias-lookups etc.\r\n\r\nIn general though I wouldn't want to disable the validation at the *model* level, but rather on a per-initialization basis. (So a separate classmethod for initializing from known-valid values would be nice.)\r\n\r\nI *think* this is possible in one way or another; I'll see if I can make any progress.\r\n\r\n----\r\n\r\n@prostomarkeloff if you really do want \"models\" with validation completely disabled under all circumstances, you might try using vanilla dataclasses?\nOkay, yes, I got this working (based on `BaseModel.validate`):\r\n\r\nThe following method could be added to your model subclass if you want to do 100% unvalidated assignment (beyond checking field names and falling back to default values):\r\n```python\r\n @classmethod\r\n def unvalidated(__pydantic_cls__: \"Type[Model]\", **data: Any) -> \"Model\":\r\n for name, field in __pydantic_cls__.__fields__.items():\r\n try:\r\n data[name]\r\n except KeyError:\r\n if field.required:\r\n raise TypeError(f\"Missing required keyword argument {name!r}\")\r\n if field.default is None:\r\n # deepcopy is quite slow on None\r\n value = None\r\n else:\r\n value = deepcopy(field.default)\r\n data[name] = value\r\n self = __pydantic_cls__.__new__(__pydantic_cls__)\r\n object.__setattr__(self, \"__dict__\", data)\r\n object.__setattr__(self, \"__fields_set__\", set(data.keys()))\r\n return self\r\n```\r\n\r\nI did some performance tests and for data-heavy models, and the performance difference is enormous:\r\n\r\n` from example-get-started runs:\r\n\r\n2.10.2\r\n```\r\nexample-get-started git:e5e08a2 py:example-get-started ❯ git ls-files\r\n.dvc/.gitignore\r\n.dvc/config\r\n.dvc/plots/confusion.json\r\n.dvc/plots/confusion_normalized.json\r\n.dvc/plots/default.json\r\n.dvc/plots/linear.json\r\n.dvc/plots/scatter.json\r\n.dvc/plots/smooth.json\r\n.dvcignore\r\n.github/workflows/cml.yaml\r\n.gitignore\r\nREADME.md\r\ndata/.gitignore\r\ndata/data.xml.dvc\r\ndvc.lock\r\ndvc.yaml\r\nparams.yaml\r\nprc.json\r\nroc.json\r\nscores.json\r\nsrc/evaluate.py\r\nsrc/featurization.py\r\nsrc/prepare.py\r\nsrc/requirements.txt\r\nsrc/train.py\r\n```\r\n\r\n2.11.0 (`data/data.xml`, `data/features/`, `data/prepared/`) have all been committed in git\r\n```\r\nexample-get-started git:48306b2 py:example-get-started ❯ git ls-files\r\n.dvc/.gitignore\r\n.dvc/config\r\n.dvc/plots/confusion.json\r\n.dvc/plots/confusion_normalized.json\r\n.dvc/plots/default.json\r\n.dvc/plots/linear.json\r\n.dvc/plots/scatter.json\r\n.dvc/plots/smooth.json\r\n.dvcignore\r\n.github/workflows/cml.yaml\r\n.gitignore\r\nREADME.md\r\ndata/.gitignore\r\ndata/data.xml\r\ndata/data.xml.dvc\r\ndata/features/test.pkl\r\ndata/features/train.pkl\r\ndata/prepared/test.tsv\r\ndata/prepared/train.tsv\r\ndvc.lock\r\ndvc.yaml\r\nmodel.pkl\r\nparams.yaml\r\nprc.json\r\nroc.json\r\nscores.json\r\nsrc/evaluate.py\r\nsrc/featurization.py\r\nsrc/prepare.py\r\nsrc/requirements.txt\r\nsrc/train.py\r\n```\nBug was introduced with https://github.com/iterative/dvc/pull/7712\r\n\r\nWhen we reproduce the exp pipeline, we ensure that all deps and outputs are tracked in either DVC or git. So the end result is that all non-DVC-tracked deps are staged in git.\r\n\r\nThe check to determine whether or not a dep is already tracked by DVC uses `dep.fs_path`, which is no longer valid after the repo root change. The bug happens because the fs path will not be identified as a DVC file, so we end up force staging all pipeline deps in git.\r\n\r\nhttps://github.com/iterative/dvc/blob/c134d4ab8e9fb2a56ffefeabbc5b636fb91a7b51/dvc/repo/reproduce.py#L61-L69\r\n\r\nAfter the root fs change, we need to checking the dep path relative to repo root and not the local filesystem path ":1}}}},{"name":"test_patch","align":"depends on text direction","type":"string","statistics":{"column_name":"test_patch","column_type":"string_text","column_statistics":{"nan_count":0,"nan_proportion":0,"min":212,"max":2218066,"mean":3852.61465,"median":1780,"std":46533.50148,"histogram":{"hist":[6370,3,0,0,0,0,0,0,1,2],"bin_edges":[212,221998,443784,665570,887356,1109142,1330928,1552714,1774500,1996286,2218066]}}}},{"name":"problem_statement","align":"depends on text direction","type":"string","statistics":{"column_name":"problem_statement","column_type":"string_text","column_statistics":{"nan_count":0,"nan_proportion":0,"min":23,"max":37708,"mean":1071.05254,"median":642,"std":1318.38605,"histogram":{"hist":[6124,225,25,0,0,0,1,0,0,1],"bin_edges":[23,3792,7561,11330,15099,18868,22637,26406,30175,33944,37708]}}}},{"name":"version","align":"depends on text direction","type":"string","statistics":{"column_name":"version","column_type":"string_label","column_statistics":{"nan_count":0,"nan_proportion":0,"no_label_count":0,"no_label_proportion":0,"n_unique":1,"frequencies":{"0.0":6376}}}},{"name":"environment_setup_commit","align":"depends on text direction","type":"string","statistics":{"column_name":"environment_setup_commit","column_type":"string_text","column_statistics":{"nan_count":0,"nan_proportion":0,"min":40,"max":40,"mean":40,"median":40,"std":0,"histogram":{"hist":[6376],"bin_edges":[40,40]}}}},{"name":"FAIL_TO_PASS","align":"left","type":"sequence","statistics":{"column_name":"FAIL_TO_PASS","column_type":"list","column_statistics":{"nan_count":0,"nan_proportion":0,"min":1,"max":4941,"mean":9.71706,"median":2,"std":75.88621,"histogram":{"hist":[6365,7,2,1,0,0,0,0,0,1],"bin_edges":[1,496,991,1486,1981,2476,2971,3466,3961,4456,4941]}}}},{"name":"PASS_TO_PASS","align":"left","type":"sequence","statistics":{"column_name":"PASS_TO_PASS","column_type":"list","column_statistics":{"nan_count":0,"nan_proportion":0,"min":0,"max":7817,"mean":47.83657,"median":13,"std":232.67874,"histogram":{"hist":[6346,20,3,0,1,0,0,3,0,3],"bin_edges":[0,782,1564,2346,3128,3910,4692,5474,6256,7038,7817]}}}},{"name":"meta","align":"left","type":"dict"},{"name":"created_at","align":"depends on text direction","type":"string","statistics":{"column_name":"created_at","column_type":"string_text","column_statistics":{"nan_count":0,"nan_proportion":0,"min":25,"max":25,"mean":25,"median":25,"std":0,"histogram":{"hist":[6376],"bin_edges":[25,25]}}}},{"name":"license","align":"depends on text direction","type":"string","statistics":{"column_name":"license","column_type":"string_label","column_statistics":{"nan_count":0,"nan_proportion":0,"no_label_count":0,"no_label_proportion":0,"n_unique":8,"frequencies":{"mit":3234,"bsd-2-clause":249,"isc":34,"bsd-4-clause":8,"cc0-1.0":35,"bsd-3-clause":1205,"zpl-2.1":40,"apache-2.0":1571}}}},{"name":"__index_level_0__","align":"right","type":"int64","statistics":{"column_name":"__index_level_0__","column_type":"int","column_statistics":{"nan_count":0,"nan_proportion":0,"min":0,"max":6410,"mean":3217.19307,"median":3222.5,"std":1848.09553,"histogram":{"hist":[626,638,627,642,642,642,642,642,642,633],"bin_edges":[0,642,1284,1926,2568,3210,3852,4494,5136,5778,6410]}}}}],"rows":[{"rowIdx":0,"cells":{"instance_id":{"kind":"string","value":"0b01001001__spectree-64"},"patch":{"kind":"string","value":"diff --git a/setup.py b/setup.py\nindex 1b3cb64..4ef21e6 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -14,7 +14,7 @@ with open(path.join(here, 'requirements.txt'), encoding='utf-8') as f:\n \n setup(\n name='spectree',\n- version='0.3.7',\n+ version='0.3.8',\n author='Keming Yang',\n author_email='kemingy94@gmail.com',\n description=('generate OpenAPI document and validate request&response '\ndiff --git a/spectree/utils.py b/spectree/utils.py\nindex bb5698d..73d6c71 100644\n--- a/spectree/utils.py\n+++ b/spectree/utils.py\n@@ -54,6 +54,7 @@ def parse_params(func, params, models):\n 'in': 'query',\n 'schema': schema,\n 'required': name in query.get('required', []),\n+ 'description': schema.get('description', ''),\n })\n \n if hasattr(func, 'headers'):\n@@ -64,6 +65,7 @@ def parse_params(func, params, models):\n 'in': 'header',\n 'schema': schema,\n 'required': name in headers.get('required', []),\n+ 'description': schema.get('description', ''),\n })\n \n if hasattr(func, 'cookies'):\n@@ -74,6 +76,7 @@ def parse_params(func, params, models):\n 'in': 'cookie',\n 'schema': schema,\n 'required': name in cookies.get('required', []),\n+ 'description': schema.get('description', ''),\n })\n \n return params\n"},"repo":{"kind":"string","value":"0b01001001/spectree"},"base_commit":{"kind":"string","value":"a091fab020ac26548250c907bae0855273a98778"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/common.py b/tests/common.py\nindex 0f2d696..83b4140 100644\n--- a/tests/common.py\n+++ b/tests/common.py\n@@ -1,7 +1,7 @@\n from enum import IntEnum, Enum\n from typing import List\n \n-from pydantic import BaseModel, root_validator\n+from pydantic import BaseModel, root_validator, Field\n \n \n class Order(IntEnum):\n@@ -43,7 +43,7 @@ class Cookies(BaseModel):\n class DemoModel(BaseModel):\n uid: int\n limit: int\n- name: str\n+ name: str = Field(..., description='user name')\n \n \n def get_paths(spec):\ndiff --git a/tests/test_utils.py b/tests/test_utils.py\nindex bf3426d..53dd3e1 100644\n--- a/tests/test_utils.py\n+++ b/tests/test_utils.py\n@@ -98,8 +98,10 @@ def test_parse_params():\n 'name': 'uid',\n 'in': 'query',\n 'required': True,\n+ 'description': '',\n 'schema': {\n 'title': 'Uid',\n 'type': 'integer',\n }\n }\n+ assert params[2]['description'] == 'user name'\n"},"problem_statement":{"kind":"string","value":"[BUG]description for query paramters can not show in swagger ui\nHi, when I add a description for a schema used in query, it can not show in swagger ui but can show in Redoc\r\n```py\r\n@HELLO.route('/', methods=['GET'])\r\n@api.validate(query=HelloForm)\r\ndef hello():\r\n \"\"\"\r\n hello 注释\r\n :return:\r\n \"\"\"\r\n return 'ok'\r\n\r\nclass HelloForm(BaseModel):\r\n \"\"\"\r\n hello表单\r\n \"\"\"\r\n user: str # 用户名称\r\n msg: str = Field(description='msg test', example='aa')\r\n index: int\r\n data: HelloGetListForm\r\n list: List[HelloListForm]\r\n```\r\n\r\n\r\n\r\n\r\n\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"a091fab020ac26548250c907bae0855273a98778"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_utils.py::test_parse_params"],"string":"[\n \"tests/test_utils.py::test_parse_params\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_utils.py::test_comments","tests/test_utils.py::test_parse_code","tests/test_utils.py::test_parse_name","tests/test_utils.py::test_has_model","tests/test_utils.py::test_parse_resp","tests/test_utils.py::test_parse_request"],"string":"[\n \"tests/test_utils.py::test_comments\",\n \"tests/test_utils.py::test_parse_code\",\n \"tests/test_utils.py::test_parse_name\",\n \"tests/test_utils.py::test_has_model\",\n \"tests/test_utils.py::test_parse_resp\",\n \"tests/test_utils.py::test_parse_request\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_hyperlinks\",\n \"has_media\",\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2020-10-12 13:21:50+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":0,"string":"0"}}},{"rowIdx":1,"cells":{"instance_id":{"kind":"string","value":"12rambau__sepal_ui-644"},"patch":{"kind":"string","value":"diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml\nindex 9fc498b3..fc69f702 100644\n--- a/.github/workflows/unit.yml\n+++ b/.github/workflows/unit.yml\n@@ -72,17 +72,19 @@ jobs:\n assert len(unexpected) == 0\n \n - name: test with pytest\n- run: coverage run -m pytest --color=yes --instafail tests\n+ run: pytest --color=yes --cov --cov-report=xml --instafail tests\n+ \n+ - name: assess dead fixtures\n+ if: matrix.python-version == '3.8'\n+ run: pytest --dead-fixtures\n \n - name: build the template panel application \n if: matrix.python-version == '3.8'\n- run: |\n- pytest --nbmake sepal_ui/templates/panel_app/ui.ipynb\n+ run: pytest --nbmake sepal_ui/templates/panel_app/ui.ipynb\n \n - name: build the template map application \n if: matrix.python-version == '3.8'\n- run: |\n- pytest --nbmake sepal_ui/templates/map_app/ui.ipynb\n+ run: pytest --nbmake sepal_ui/templates/map_app/ui.ipynb\n \n - name: coverage\n run: coverage xml\ndiff --git a/sepal_ui/sepalwidgets/btn.py b/sepal_ui/sepalwidgets/btn.py\nindex 137622fa..105f6160 100644\n--- a/sepal_ui/sepalwidgets/btn.py\n+++ b/sepal_ui/sepalwidgets/btn.py\n@@ -25,6 +25,9 @@ class Btn(v.Btn, SepalWidget):\n \n .. deprecated:: 2.13\n ``text`` and ``icon`` will be replaced by ``msg`` and ``gliph`` to avoid duplicating ipyvuetify trait.\n+\n+ .. deprecated:: 2.14\n+ Btn is not using a default ``msg`` anymor`.\n \"\"\"\n \n v_icon = None\n@@ -36,7 +39,7 @@ class Btn(v.Btn, SepalWidget):\n msg = Unicode(\"\").tag(sync=True)\n \"traitlet.Unicode: the text of the btn\"\n \n- def __init__(self, msg=\"Click\", gliph=\"\", **kwargs):\n+ def __init__(self, msg=\"\", gliph=\"\", **kwargs):\n \n # deprecation in 2.13 of text and icon\n # as they already exist in the ipyvuetify Btn traits (as booleans)\n@@ -55,7 +58,7 @@ class Btn(v.Btn, SepalWidget):\n )\n \n # create the default v_icon\n- self.v_icon = v.Icon(left=True, children=[\"\"])\n+ self.v_icon = v.Icon(children=[\"\"])\n \n # set the default parameters\n kwargs[\"color\"] = kwargs.pop(\"color\", \"primary\")\n@@ -89,6 +92,7 @@ class Btn(v.Btn, SepalWidget):\n Set the text of the btn\n \"\"\"\n \n+ self.v_icon.left = bool(change[\"new\"])\n self.children = [self.v_icon, change[\"new\"]]\n \n return self\ndiff --git a/setup.py b/setup.py\nindex 84775ae4..e7ca3ccf 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -65,7 +65,7 @@ setup_params = {\n \"cryptography\",\n \"python-box\",\n \"xyzservices\",\n- \"planet==2.0a2\", # this is a prerelease\n+ \"planet>=2.0\",\n \"pyyaml\",\n \"dask\",\n \"tqdm\",\n@@ -83,6 +83,8 @@ setup_params = {\n \"pytest-sugar\",\n \"pytest-icdiff\",\n \"pytest-instafail\",\n+ \"pytest-deadfixtures\",\n+ \"pytest-cov\",\n \"nbmake \",\n ],\n \"doc\": [\n"},"repo":{"kind":"string","value":"12rambau/sepal_ui"},"base_commit":{"kind":"string","value":"8a8196e3c7893b7a0aebdb4910e83054f59e0374"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/test_Btn.py b/tests/test_Btn.py\nindex fcaed760..4e3cb9b5 100644\n--- a/tests/test_Btn.py\n+++ b/tests/test_Btn.py\n@@ -11,7 +11,7 @@ class TestBtn:\n btn = sw.Btn()\n assert btn.color == \"primary\"\n assert btn.v_icon.children[0] == \"\"\n- assert btn.children[1] == \"Click\"\n+ assert btn.children[1] == \"\"\n \n # extensive btn\n btn = sw.Btn(\"toto\", \"fas fa-folder\")\n@@ -42,12 +42,18 @@ class TestBtn:\n \n assert isinstance(btn.v_icon, v.Icon)\n assert btn.v_icon.children[0] == gliph\n+ assert btn.v_icon.left is True\n \n # change existing icon\n gliph = \"fas fa-file\"\n btn.gliph = gliph\n assert btn.v_icon.children[0] == gliph\n \n+ # display only the gliph\n+ btn.msg = \"\"\n+ assert btn.children[1] == \"\"\n+ assert btn.v_icon.left is False\n+\n # remove all gliph\n gliph = \"\"\n btn.gliph = gliph\n@@ -79,4 +85,4 @@ class TestBtn:\n def btn(self):\n \"\"\"Create a simple btn\"\"\"\n \n- return sw.Btn()\n+ return sw.Btn(\"Click\")\ndiff --git a/tests/test_PlanetModel.py b/tests/test_PlanetModel.py\nindex f84d2e1f..d6d63c5a 100644\n--- a/tests/test_PlanetModel.py\n+++ b/tests/test_PlanetModel.py\n@@ -9,11 +9,17 @@ from sepal_ui.planetapi import PlanetModel\n \n @pytest.mark.skipif(\"PLANET_API_KEY\" not in os.environ, reason=\"requires Planet\")\n class TestPlanetModel:\n- @pytest.mark.parametrize(\"credentials\", [\"planet_key\", \"cred\"])\n- def test_init(self, credentials, request):\n+ def test_init(self, planet_key, cred, request):\n+\n+ # Test with a valid api key\n+ planet_model = PlanetModel(planet_key)\n+\n+ assert isinstance(planet_model, PlanetModel)\n+ assert isinstance(planet_model.session, planet.http.Session)\n+ assert planet_model.active is True\n \n- # Test with a valid api key and login credentials\n- planet_model = PlanetModel(request.getfixturevalue(credentials))\n+ # Test with a valid login credentials\n+ planet_model = PlanetModel(cred)\n \n assert isinstance(planet_model, PlanetModel)\n assert isinstance(planet_model.session, planet.http.Session)\n@@ -56,10 +62,7 @@ class TestPlanetModel:\n \n return\n \n- def test_is_active(self, planet_key):\n-\n- # We only need to test with a key.\n- planet_model = PlanetModel(planet_key)\n+ def test_is_active(self, planet_model):\n \n planet_model._is_active()\n assert planet_model.active is True\n@@ -69,9 +72,8 @@ class TestPlanetModel:\n \n return\n \n- def test_get_subscriptions(self, planet_key):\n+ def test_get_subscriptions(self, planet_model):\n \n- planet_model = PlanetModel(planet_key)\n subs = planet_model.get_subscriptions()\n \n # Check object has length, because there is no way to check a value\n@@ -80,10 +82,7 @@ class TestPlanetModel:\n \n return\n \n- def test_get_planet_items(self, planet_key):\n-\n- # Arrange\n- planet_model = PlanetModel(planet_key)\n+ def test_get_planet_items(self, planet_model):\n \n aoi = { # Yasuni national park in Ecuador\n \"type\": \"Polygon\",\n@@ -119,3 +118,11 @@ class TestPlanetModel:\n credentials = json.loads(os.getenv(\"PLANET_API_CREDENTIALS\"))\n \n return list(credentials.values())\n+\n+ @pytest.fixture\n+ def planet_model(self):\n+ \"\"\"Start a planet model using the API key\"\"\"\n+\n+ key = os.getenv(\"PLANET_API_KEY\")\n+\n+ return PlanetModel(key)\n"},"problem_statement":{"kind":"string","value":"sepal_ui.Btn does't work as expected \nI want to create a simple Icon button, to do so:\r\n\r\n```python\r\nsw.Btn(icon=True, gliph =\"mdi-plus\")\r\n```\r\nDoing this, without \"msg\" parameter will add the default text to the button which is \"click\", I think is worthless having that value.\r\n\r\nSo if I want to remove the default text, I would expect doing this:\r\n```python\r\nsw.Btn(children = [\"\"], icon=True, gliph =\"mdi-plus\")\r\n# or \r\nsw.Btn(msg= \"\"] icon=True, gliph =\"mdi-plus\")\r\n```\r\n\r\nWhich leads the icon aligned to the left and not centered (as it is using a empyt string as message).\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"8a8196e3c7893b7a0aebdb4910e83054f59e0374"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_Btn.py::TestBtn::test_init","tests/test_Btn.py::TestBtn::test_set_gliph"],"string":"[\n \"tests/test_Btn.py::TestBtn::test_init\",\n \"tests/test_Btn.py::TestBtn::test_set_gliph\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_Btn.py::TestBtn::test_toggle_loading","tests/test_Btn.py::TestBtn::test_set_msg"],"string":"[\n \"tests/test_Btn.py::TestBtn::test_toggle_loading\",\n \"tests/test_Btn.py::TestBtn::test_set_msg\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2022-11-29 14:42:21+00:00"},"license":{"kind":"string","value":"mit"},"__index_level_0__":{"kind":"number","value":1,"string":"1"}}},{"rowIdx":2,"cells":{"instance_id":{"kind":"string","value":"15five__scim2-filter-parser-13"},"patch":{"kind":"string","value":"diff --git a/CHANGELOG.rst b/CHANGELOG.rst\nindex 12a5d4f..178f172 100644\n--- a/CHANGELOG.rst\n+++ b/CHANGELOG.rst\n@@ -1,6 +1,10 @@\n CHANGE LOG\n ==========\n \n+0.3.5\n+-----\n+- Update the sql.Transpiler to collect namedtuples rather than tuples for attr paths\n+\n 0.3.4\n -----\n - Update tox.ini and clean up linting errors\ndiff --git a/setup.py b/setup.py\nindex bbf57bf..bd16f70 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -14,7 +14,7 @@ def long_description():\n \n setup(\n name='scim2-filter-parser',\n- version='0.3.4',\n+ version='0.3.5',\n description='A customizable parser/transpiler for SCIM2.0 filters',\n url='https://github.com/15five/scim2-filter-parser',\n maintainer='Paul Logston',\ndiff --git a/src/scim2_filter_parser/transpilers/sql.py b/src/scim2_filter_parser/transpilers/sql.py\nindex 6254f1e..2107758 100644\n--- a/src/scim2_filter_parser/transpilers/sql.py\n+++ b/src/scim2_filter_parser/transpilers/sql.py\n@@ -4,9 +4,12 @@ clause based on a SCIM filter.\n \"\"\"\n import ast\n import string\n+import collections\n \n from .. import ast as scim2ast\n \n+AttrPath = collections.namedtuple('AttrPath', ['attr_name', 'sub_attr', 'uri'])\n+\n \n class Transpiler(ast.NodeTransformer):\n \"\"\"\n@@ -145,7 +148,7 @@ class Transpiler(ast.NodeTransformer):\n \n # Convert attr_name to another value based on map.\n # Otherwise, return None.\n- attr_path_tuple = (attr_name_value, sub_attr_value, uri_value)\n+ attr_path_tuple = AttrPath(attr_name_value, sub_attr_value, uri_value)\n self.attr_paths.append(attr_path_tuple)\n return self.attr_map.get(attr_path_tuple)\n \n"},"repo":{"kind":"string","value":"15five/scim2-filter-parser"},"base_commit":{"kind":"string","value":"3ed1858b492542d0bc9b9e9ab9547641595e28c1"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/test_transpiler.py b/tests/test_transpiler.py\nindex b8e1bb4..280c2d3 100644\n--- a/tests/test_transpiler.py\n+++ b/tests/test_transpiler.py\n@@ -36,6 +36,16 @@ class RFCExamples(TestCase):\n self.assertEqual(expected_sql, sql, query)\n self.assertEqual(expected_params, params, query)\n \n+ def test_attr_paths_are_created(self):\n+ query = 'userName eq \"bjensen\"'\n+ tokens = self.lexer.tokenize(query)\n+ ast = self.parser.parse(tokens)\n+ self.transpiler.transpile(ast)\n+\n+ self.assertEqual(len(self.transpiler.attr_paths), 1)\n+ for path in self.transpiler.attr_paths:\n+ self.assertTrue(isinstance(path, transpile_sql.AttrPath))\n+\n def test_username_eq(self):\n query = 'userName eq \"bjensen\"'\n sql = \"username = {a}\"\n"},"problem_statement":{"kind":"string","value":"Return NamedTuple rather than tuple.\nIt would be nice to return a NamedTuple instead of a tuple here: \r\n\r\nhttps://github.com/15five/scim2-filter-parser/blob/7ddc216f8c3dd1cdb2152944187e8f7f5ee07be2/src/scim2_filter_parser/transpilers/sql.py#L148\r\n\r\nThis way parts of each path could be accessed by name rather than by index in the tuple."},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"3ed1858b492542d0bc9b9e9ab9547641595e28c1"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_transpiler.py::RFCExamples::test_attr_paths_are_created"],"string":"[\n \"tests/test_transpiler.py::RFCExamples::test_attr_paths_are_created\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_transpiler.py::CommandLine::test_command_line","tests/test_transpiler.py::AzureQueries::test_email_type_eq_primary_value_eq_uuid","tests/test_transpiler.py::AzureQueries::test_parse_simple_email_filter_with_uuid","tests/test_transpiler.py::AzureQueries::test_external_id_from_azure","tests/test_transpiler.py::UndefinedAttributes::test_schemas_eq","tests/test_transpiler.py::UndefinedAttributes::test_title_has_value_and_user_type_eq_1","tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_1","tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_2","tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_2","tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_1","tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_email_contains_or_email_contains","tests/test_transpiler.py::UndefinedAttributes::test_email_type_eq_primary_value_eq_uuid_1","tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_3","tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_3","tests/test_transpiler.py::UndefinedAttributes::test_email_type_eq_primary_value_eq_uuid_2","tests/test_transpiler.py::UndefinedAttributes::test_title_has_value_and_user_type_eq_2","tests/test_transpiler.py::UndefinedAttributes::test_user_type_ne_and_not_email_contains_or_email_contains","tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_4","tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_1","tests/test_transpiler.py::UndefinedAttributes::test_username_eq","tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_2","tests/test_transpiler.py::RFCExamples::test_username_eq","tests/test_transpiler.py::RFCExamples::test_schema_username_startswith","tests/test_transpiler.py::RFCExamples::test_title_has_value","tests/test_transpiler.py::RFCExamples::test_family_name_contains","tests/test_transpiler.py::RFCExamples::test_meta_last_modified_lt","tests/test_transpiler.py::RFCExamples::test_meta_last_modified_ge","tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_not_email_type_eq_work_and_value_contains","tests/test_transpiler.py::RFCExamples::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians","tests/test_transpiler.py::RFCExamples::test_meta_last_modified_le","tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_not_email_type_eq","tests/test_transpiler.py::RFCExamples::test_title_has_value_and_user_type_eq","tests/test_transpiler.py::RFCExamples::test_schemas_eq","tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_email_contains_or_email_contains","tests/test_transpiler.py::RFCExamples::test_title_has_value_or_user_type_eq","tests/test_transpiler.py::RFCExamples::test_meta_last_modified_gt","tests/test_transpiler.py::RFCExamples::test_user_type_ne_and_not_email_contains_or_email_contains","tests/test_transpiler.py::RFCExamples::test_username_startswith"],"string":"[\n \"tests/test_transpiler.py::CommandLine::test_command_line\",\n \"tests/test_transpiler.py::AzureQueries::test_email_type_eq_primary_value_eq_uuid\",\n \"tests/test_transpiler.py::AzureQueries::test_parse_simple_email_filter_with_uuid\",\n \"tests/test_transpiler.py::AzureQueries::test_external_id_from_azure\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_schemas_eq\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_title_has_value_and_user_type_eq_1\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_1\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_2\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_2\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_1\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_email_contains_or_email_contains\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_email_type_eq_primary_value_eq_uuid_1\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_3\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_3\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_email_type_eq_primary_value_eq_uuid_2\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_title_has_value_and_user_type_eq_2\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_user_type_ne_and_not_email_contains_or_email_contains\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_4\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_1\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_username_eq\",\n \"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_2\",\n \"tests/test_transpiler.py::RFCExamples::test_username_eq\",\n \"tests/test_transpiler.py::RFCExamples::test_schema_username_startswith\",\n \"tests/test_transpiler.py::RFCExamples::test_title_has_value\",\n \"tests/test_transpiler.py::RFCExamples::test_family_name_contains\",\n \"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_lt\",\n \"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_ge\",\n \"tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_not_email_type_eq_work_and_value_contains\",\n \"tests/test_transpiler.py::RFCExamples::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians\",\n \"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_le\",\n \"tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_not_email_type_eq\",\n \"tests/test_transpiler.py::RFCExamples::test_title_has_value_and_user_type_eq\",\n \"tests/test_transpiler.py::RFCExamples::test_schemas_eq\",\n \"tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_email_contains_or_email_contains\",\n \"tests/test_transpiler.py::RFCExamples::test_title_has_value_or_user_type_eq\",\n \"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_gt\",\n \"tests/test_transpiler.py::RFCExamples::test_user_type_ne_and_not_email_contains_or_email_contains\",\n \"tests/test_transpiler.py::RFCExamples::test_username_startswith\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_short_problem_statement\",\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2020-07-30 14:25:04+00:00"},"license":{"kind":"string","value":"mit"},"__index_level_0__":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":3,"cells":{"instance_id":{"kind":"string","value":"15five__scim2-filter-parser-20"},"patch":{"kind":"string","value":"diff --git a/src/scim2_filter_parser/parser.py b/src/scim2_filter_parser/parser.py\nindex 516f65d..12c693e 100644\n--- a/src/scim2_filter_parser/parser.py\n+++ b/src/scim2_filter_parser/parser.py\n@@ -110,9 +110,8 @@ class SCIMParser(Parser):\n # which takes precedence over \"or\"\n # 3. Attribute operators\n precedence = (\n- ('nonassoc', OR), # noqa F821\n- ('nonassoc', AND), # noqa F821\n- ('nonassoc', NOT), # noqa F821\n+ ('left', OR, AND), # noqa F821\n+ ('right', NOT), # noqa F821\n )\n \n # FILTER = attrExp / logExp / valuePath / *1\"not\" \"(\" FILTER \")\"\n"},"repo":{"kind":"string","value":"15five/scim2-filter-parser"},"base_commit":{"kind":"string","value":"08de23c5626556a37beced764a22a2fa7021989b"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/test_parser.py b/tests/test_parser.py\nindex 4ff562c..19aa198 100644\n--- a/tests/test_parser.py\n+++ b/tests/test_parser.py\n@@ -47,6 +47,24 @@ class BuggyQueries(TestCase):\n with self.assertRaises(parser.SCIMParserError):\n self.parser.parse(token_stream)\n \n+ def test_g17_1_log_exp_order(self):\n+ query = 'displayName co \"username\" or nickName co \"username\" or userName co \"username\"'\n+\n+ tokens = self.lexer.tokenize(query)\n+ self.parser.parse(tokens) # Should not raise error\n+\n+ def test_g17_2_log_exp_order(self):\n+ query = 'displayName co \"username\" and nickName co \"username\" and userName co \"username\"'\n+\n+ tokens = self.lexer.tokenize(query)\n+ self.parser.parse(tokens) # Should not raise error\n+\n+ def test_g17_3_log_exp_order(self):\n+ query = 'displayName co \"username\" and nickName co \"username\" or userName co \"username\"'\n+\n+ tokens = self.lexer.tokenize(query)\n+ self.parser.parse(tokens) # Should not raise error\n+\n \n class CommandLine(TestCase):\n def setUp(self):\n"},"problem_statement":{"kind":"string","value":"Issue when using multiple \"or\" or \"and\"\nHi,\r\n\r\nI am facing an issue, where the query having two or more \"and\" or more than two \"or\" is failing.\r\nHave a look at examples below: - \r\n\r\n1)```\"displayName co \\\"username\\\" or nickName co \\\"username\\\" or userName co \\\"username\\\"\"```\r\n ```\"displayName co \\\"username\\\" and nickName co \\\"username\\\" and userName co \\\"username\\\"\"```\r\n\r\nthe two queries fails giving ,\r\n```scim2_filter_parser.parser.SCIMParserError: Parsing error at: Token(type='OR', value='or', lineno=1, index=52)```\r\n \r\nnotice above queries are having either only \"or\" or \"and\".\r\n\r\n2)```\"displayName co \\\"username\\\" and nickName co \\\"username\\\" or userName co \\\"username\\\"\"```\r\nbut this query works.\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"08de23c5626556a37beced764a22a2fa7021989b"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_parser.py::BuggyQueries::test_g17_2_log_exp_order","tests/test_parser.py::BuggyQueries::test_g17_1_log_exp_order"],"string":"[\n \"tests/test_parser.py::BuggyQueries::test_g17_2_log_exp_order\",\n \"tests/test_parser.py::BuggyQueries::test_g17_1_log_exp_order\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_parser.py::BuggyQueries::test_g17_3_log_exp_order","tests/test_parser.py::BuggyQueries::test_no_quotes_around_comp_value","tests/test_parser.py::RegressionTestQueries::test_command_line","tests/test_parser.py::CommandLine::test_command_line"],"string":"[\n \"tests/test_parser.py::BuggyQueries::test_g17_3_log_exp_order\",\n \"tests/test_parser.py::BuggyQueries::test_no_quotes_around_comp_value\",\n \"tests/test_parser.py::RegressionTestQueries::test_command_line\",\n \"tests/test_parser.py::CommandLine::test_command_line\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_pytest_match_arg\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2020-10-18 03:21:13+00:00"},"license":{"kind":"string","value":"mit"},"__index_level_0__":{"kind":"number","value":3,"string":"3"}}},{"rowIdx":4,"cells":{"instance_id":{"kind":"string","value":"20c__ctl-3"},"patch":{"kind":"string","value":"diff --git a/src/ctl/plugins/pypi.py b/src/ctl/plugins/pypi.py\nindex 5d979af..a6117af 100644\n--- a/src/ctl/plugins/pypi.py\n+++ b/src/ctl/plugins/pypi.py\n@@ -32,7 +32,7 @@ class PyPIPluginConfig(release.ReleasePluginConfig):\n config_file = confu.schema.Str(help=\"path to pypi config file (e.g. ~/.pypirc)\")\n \n # PyPI repository name, needs to exist in your pypi config file\n- repository = confu.schema.Str(\n+ pypi_repository = confu.schema.Str(\n help=\"PyPI repository name - needs to exist \" \"in your pypi config file\",\n default=\"pypi\",\n )\n@@ -55,16 +55,16 @@ class PyPIPlugin(release.ReleasePlugin):\n \n @property\n def dist_path(self):\n- return os.path.join(self.target.checkout_path, \"dist\", \"*\")\n+ return os.path.join(self.repository.checkout_path, \"dist\", \"*\")\n \n def prepare(self):\n super(PyPIPlugin, self).prepare()\n self.shell = True\n- self.repository = self.get_config(\"repository\")\n+ self.pypi_repository = self.get_config(\"pypi_repository\")\n self.pypirc_path = os.path.expanduser(self.config.get(\"config_file\"))\n self.twine_settings = Settings(\n config_file=self.pypirc_path,\n- repository_name=self.repository,\n+ repository_name=self.pypi_repository,\n sign=self.get_config(\"sign\"),\n identity=self.get_config(\"identity\"),\n sign_with=self.get_config(\"sign_with\"),\ndiff --git a/src/ctl/plugins/release.py b/src/ctl/plugins/release.py\nindex bcfa1ce..dcae2f4 100644\n--- a/src/ctl/plugins/release.py\n+++ b/src/ctl/plugins/release.py\n@@ -18,8 +18,8 @@ import ctl.plugins.git\n \n \n class ReleasePluginConfig(confu.schema.Schema):\n- target = confu.schema.Str(\n- help=\"target for release - should be a path \"\n+ repository = confu.schema.Str(\n+ help=\"repository target for release - should be a path \"\n \"to a python package or the name of a \"\n \"repository type plugin\",\n cli=False,\n@@ -46,16 +46,16 @@ class ReleasePlugin(command.CommandPlugin):\n \"version\",\n nargs=1,\n type=str,\n- help=\"release version - if target is managed by git, \"\n+ help=\"release version - if repository is managed by git, \"\n \"checkout this branch/tag\",\n )\n \n group.add_argument(\n- \"target\",\n+ \"repository\",\n nargs=\"?\",\n type=str,\n- default=plugin_config.get(\"target\"),\n- help=ReleasePluginConfig().target.help,\n+ default=plugin_config.get(\"repository\"),\n+ help=ReleasePluginConfig().repository.help,\n )\n \n sub = parser.add_subparsers(title=\"Operation\", dest=\"op\")\n@@ -74,7 +74,7 @@ class ReleasePlugin(command.CommandPlugin):\n \n return {\n \"group\": group,\n- \"confu_target\": op_release_parser,\n+ \"confu_repository\": op_release_parser,\n \"op_release_parser\": op_release_parser,\n \"op_validate_parser\": op_validate_parser,\n }\n@@ -84,48 +84,48 @@ class ReleasePlugin(command.CommandPlugin):\n self.prepare()\n self.shell = True\n \n- self.set_target(self.get_config(\"target\"))\n+ self.set_repository(self.get_config(\"repository\"))\n self.dry_run = kwargs.get(\"dry\")\n self.version = kwargs.get(\"version\")[0]\n- self.orig_branch = self.target.branch\n+ self.orig_branch = self.repository.branch\n \n if self.dry_run:\n self.log.info(\"Doing dry run...\")\n- self.log.info(\"Release target: {}\".format(self.target))\n+ self.log.info(\"Release repository: {}\".format(self.repository))\n \n try:\n- self.target.checkout(self.version)\n+ self.repository.checkout(self.version)\n op = self.get_op(kwargs.get(\"op\"))\n op(**kwargs)\n finally:\n- self.target.checkout(self.orig_branch)\n+ self.repository.checkout(self.orig_branch)\n \n- def set_target(self, target):\n- if not target:\n- raise ValueError(\"No target specified\")\n+ def set_repository(self, repository):\n+ if not repository:\n+ raise ValueError(\"No repository specified\")\n \n try:\n- self.target = self.other_plugin(target)\n- if not isinstance(self.target, ctl.plugins.repository.RepositoryPlugin):\n+ self.repository = self.other_plugin(repository)\n+ if not isinstance(self.repository, ctl.plugins.repository.RepositoryPlugin):\n raise TypeError(\n \"The plugin with the name `{}` is not a \"\n \"repository type plugin and cannot be used \"\n- \"as a target\".format(target)\n+ \"as a repository\".format(repository)\n )\n except KeyError:\n- self.target = os.path.abspath(target)\n- if not os.path.exists(self.target):\n+ self.repository = os.path.abspath(repository)\n+ if not os.path.exists(self.repository):\n raise IOError(\n \"Target is neither a configured repository \"\n \"plugin nor a valid file path: \"\n- \"{}\".format(self.target)\n+ \"{}\".format(self.repository)\n )\n \n- self.target = ctl.plugins.git.temporary_plugin(\n- self.ctl, \"{}__tmp_repo\".format(self.plugin_name), self.target\n+ self.repository = ctl.plugins.git.temporary_plugin(\n+ self.ctl, \"{}__tmp_repo\".format(self.plugin_name), self.repository\n )\n \n- self.cwd = self.target.checkout_path\n+ self.cwd = self.repository.checkout_path\n \n @expose(\"ctl.{plugin_name}.release\")\n def release(self, **kwargs):\n"},"repo":{"kind":"string","value":"20c/ctl"},"base_commit":{"kind":"string","value":"879af37647e61767a1ede59ffd353e4cfd27cd6f"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/test_plugin_pypi.py b/tests/test_plugin_pypi.py\nindex 20315ad..19813e2 100644\n--- a/tests/test_plugin_pypi.py\n+++ b/tests/test_plugin_pypi.py\n@@ -53,35 +53,35 @@ def test_init():\n \n \n \n-def test_set_target_git_path(tmpdir, ctlr):\n+def test_set_repository_git_path(tmpdir, ctlr):\n \"\"\"\n- Test setting build target: existing git repo via filepath\n+ Test setting build repository: existing git repo via filepath\n \"\"\"\n \n plugin, git_plugin = instantiate(tmpdir, ctlr)\n \n- plugin.set_target(git_plugin.checkout_path)\n+ plugin.set_repository(git_plugin.checkout_path)\n \n assert plugin.dist_path == os.path.join(git_plugin.checkout_path,\n \"dist\", \"*\")\n \n \n-def test_set_target_git_plugin(tmpdir, ctlr):\n+def test_set_repository_git_plugin(tmpdir, ctlr):\n \"\"\"\n- Test setting build target: existing git plugin\n+ Test setting build repository: existing git plugin\n \"\"\"\n \n plugin, git_plugin = instantiate(tmpdir, ctlr)\n \n- plugin.set_target(git_plugin.plugin_name)\n+ plugin.set_repository(git_plugin.plugin_name)\n \n assert plugin.dist_path == os.path.join(git_plugin.checkout_path,\n \"dist\", \"*\")\n \n \n-def test_set_target_error(tmpdir, ctlr):\n+def test_set_repository_error(tmpdir, ctlr):\n \"\"\"\n- Test setting invalid build target\n+ Test setting invalid build repository\n \"\"\"\n \n plugin, git_plugin = instantiate(tmpdir, ctlr)\n@@ -89,17 +89,17 @@ def test_set_target_error(tmpdir, ctlr):\n # non existing path / plugin name\n \n with pytest.raises(IOError):\n- plugin.set_target(\"invalid target\")\n+ plugin.set_repository(\"invalid repository\")\n \n # invalid plugin type\n \n with pytest.raises(TypeError):\n- plugin.set_target(\"test_pypi\")\n+ plugin.set_repository(\"test_pypi\")\n \n- # no target\n+ # no repository\n \n with pytest.raises(ValueError):\n- plugin.set_target(None)\n+ plugin.set_repository(None)\n \n \n def test_build_dist(tmpdir, ctlr):\n@@ -110,7 +110,7 @@ def test_build_dist(tmpdir, ctlr):\n \n plugin, git_plugin = instantiate(tmpdir, ctlr)\n plugin.prepare()\n- plugin.set_target(git_plugin.plugin_name)\n+ plugin.set_repository(git_plugin.plugin_name)\n plugin._build_dist()\n \n assert os.path.exists(os.path.join(git_plugin.checkout_path,\n@@ -126,7 +126,7 @@ def test_validate_dist(tmpdir, ctlr):\n \n plugin, git_plugin = instantiate(tmpdir, ctlr)\n plugin.prepare()\n- plugin.set_target(git_plugin.plugin_name)\n+ plugin.set_repository(git_plugin.plugin_name)\n plugin._build_dist()\n plugin._validate_dist()\n \n"},"problem_statement":{"kind":"string","value":"PyPI plugin: `target` config attribute should be `repository`\nThis is so it's in line with the version plugin, which currently uses `repository` to specify the target repository\r\n\r\nThe pypi plugin currently uses `repository` to specify which PyPI repository to use, this should change to `pypi_repository` as well.\r\n\r\nShould do this before tagging 1.0.0 since it's a config schema change"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"879af37647e61767a1ede59ffd353e4cfd27cd6f"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_plugin_pypi.py::test_set_repository_git_path[standard]","tests/test_plugin_pypi.py::test_set_repository_error[standard]","tests/test_plugin_pypi.py::test_set_repository_git_plugin[standard]"],"string":"[\n \"tests/test_plugin_pypi.py::test_set_repository_git_path[standard]\",\n \"tests/test_plugin_pypi.py::test_set_repository_error[standard]\",\n \"tests/test_plugin_pypi.py::test_set_repository_git_plugin[standard]\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_plugin_pypi.py::test_init"],"string":"[\n \"tests/test_plugin_pypi.py::test_init\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2019-10-08 09:23:56+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":4,"string":"4"}}},{"rowIdx":5,"cells":{"instance_id":{"kind":"string","value":"20c__ctl-7"},"patch":{"kind":"string","value":"diff --git a/Ctl/Pipfile b/Ctl/Pipfile\nindex 0c7a304..1bd6308 100644\n--- a/Ctl/Pipfile\n+++ b/Ctl/Pipfile\n@@ -14,7 +14,7 @@ tmpl = \"==0.3.0\"\n \n [packages]\n munge = \"<1,>=0.4\"\n-cfu = \">=1.2.0,<2\"\n+cfu = \">=1.3.0,<2\"\n grainy = \">=1.4.0,<2\"\n git-url-parse = \">=1.1.0,<2\"\n pluginmgr = \">=0.6\"\ndiff --git a/Ctl/requirements.txt b/Ctl/requirements.txt\nindex b3582c5..0037aaa 100644\n--- a/Ctl/requirements.txt\n+++ b/Ctl/requirements.txt\n@@ -1,5 +1,5 @@\n munge >=0.4, <1\n-cfu >= 1.2.0, < 2\n+cfu >= 1.3.0, < 2\n grainy >= 1.4.0, <2\n git-url-parse >= 1.1.0, <2\n pluginmgr >= 0.6\ndiff --git a/src/ctl/__init__.py b/src/ctl/__init__.py\nindex eb4a635..b9616df 100644\n--- a/src/ctl/__init__.py\n+++ b/src/ctl/__init__.py\n@@ -4,6 +4,7 @@ import os\n from pkg_resources import get_distribution\n \n import confu.config\n+import confu.exceptions\n import grainy.core\n import copy\n import logging\n@@ -279,11 +280,14 @@ class Ctl(object):\n # def set_config_dir(self):\n \n def __init__(self, ctx=None, config_dir=None, full_init=True):\n- self.init_context(ctx=ctx, config_dir=config_dir)\n \n+ self.init_context(ctx=ctx, config_dir=config_dir)\n self.init_logging()\n- self.init_permissions()\n \n+ if self.config.errors:\n+ return self.log_config_issues()\n+\n+ self.init_permissions()\n self.expose_plugin_vars()\n \n if full_init:\n@@ -330,8 +334,10 @@ class Ctl(object):\n Apply python logging config and create `log` and `usage_log`\n properties\n \"\"\"\n+\n # allow setting up python logging from ctl config\n set_pylogger_config(self.ctx.config.get_nested(\"ctl\", \"log\"))\n+\n # instantiate logger\n self.log = Log(\"ctl\")\n self.usage_log = Log(\"usage\")\ndiff --git a/src/ctl/util/versioning.py b/src/ctl/util/versioning.py\nindex 22bdb09..23e1390 100644\n--- a/src/ctl/util/versioning.py\n+++ b/src/ctl/util/versioning.py\n@@ -1,5 +1,4 @@\n def version_tuple(version):\n- print(\"VERSION\", version)\n \"\"\" Returns a tuple from version string \"\"\"\n return tuple(version.split(\".\"))\n \n@@ -9,27 +8,35 @@ def version_string(version):\n return \".\".join([\"{}\".format(v) for v in version])\n \n \n-def validate_semantic(version):\n+def validate_semantic(version, pad=0):\n if not isinstance(version, (list, tuple)):\n version = version_tuple(version)\n \n- try:\n- major, minor, patch, dev = version\n- except ValueError:\n- major, minor, patch = version\n+ parts = len(version)\n+\n+ if parts < 1:\n+ raise ValueError(\"Semantic version needs to contain at least a major version\")\n+ if parts > 4:\n+ raise ValueError(\"Semantic version can not contain more than 4 parts\")\n+\n+ if parts < pad:\n+ version = tuple(list(version) + [0 for i in range(0, pad - parts)])\n \n return tuple([int(n) for n in version])\n \n \n def bump_semantic(version, segment):\n- version = list(validate_semantic(version))\n if segment == \"major\":\n+ version = list(validate_semantic(version))\n return (version[0] + 1, 0, 0)\n elif segment == \"minor\":\n+ version = list(validate_semantic(version, pad=2))\n return (version[0], version[1] + 1, 0)\n elif segment == \"patch\":\n+ version = list(validate_semantic(version, pad=3))\n return (version[0], version[1], version[2] + 1)\n elif segment == \"dev\":\n+ version = list(validate_semantic(version, pad=4))\n try:\n return (version[0], version[1], version[2], version[3] + 1)\n except IndexError:\n"},"repo":{"kind":"string","value":"20c/ctl"},"base_commit":{"kind":"string","value":"be7f350f8f2d92918922d82fce0266fcd72decd2"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/test_plugin_version.py b/tests/test_plugin_version.py\nindex 6745c78..4b9617a 100644\n--- a/tests/test_plugin_version.py\n+++ b/tests/test_plugin_version.py\n@@ -138,6 +138,30 @@ def test_bump(tmpdir, ctlr):\n plugin.bump(version=\"invalid\", repo=\"dummy_repo\")\n \n \n+def test_bump_truncated(tmpdir, ctlr):\n+ plugin, dummy_repo = instantiate(tmpdir, ctlr)\n+ plugin.tag(version=\"1.0\", repo=\"dummy_repo\")\n+\n+ plugin.bump(version=\"minor\", repo=\"dummy_repo\")\n+ assert dummy_repo.version == (\"1\", \"1\", \"0\")\n+ assert dummy_repo._tag == \"1.1.0\"\n+\n+ plugin.tag(version=\"1.0\", repo=\"dummy_repo\")\n+ plugin.bump(version=\"patch\", repo=\"dummy_repo\")\n+ assert dummy_repo.version == (\"1\", \"0\", \"1\")\n+ assert dummy_repo._tag == \"1.0.1\"\n+\n+ plugin.tag(version=\"2\", repo=\"dummy_repo\")\n+ plugin.bump(version=\"patch\", repo=\"dummy_repo\")\n+ assert dummy_repo.version == (\"2\", \"0\", \"1\")\n+ assert dummy_repo._tag == \"2.0.1\"\n+\n+ plugin.tag(version=\"3\", repo=\"dummy_repo\")\n+ plugin.bump(version=\"major\", repo=\"dummy_repo\")\n+ assert dummy_repo.version == (\"4\", \"0\", \"0\")\n+ assert dummy_repo._tag == \"4.0.0\"\n+\n+\n def test_execute(tmpdir, ctlr):\n plugin, dummy_repo = instantiate(tmpdir, ctlr)\n plugin.execute(op=\"tag\", version=\"1.0.0\", repository=\"dummy_repo\", init=True)\ndiff --git a/tests/test_util_versioning.py b/tests/test_util_versioning.py\nindex b89df79..6624816 100644\n--- a/tests/test_util_versioning.py\n+++ b/tests/test_util_versioning.py\n@@ -19,7 +19,7 @@ def test_version_tuple(version, string):\n ((1, 0, 0), (1, 0, 0), None),\n (\"1.0.0.0\", (1, 0, 0, 0), None),\n ((1, 0, 0, 0), (1, 0, 0, 0), None),\n- (\"1.0\", None, ValueError),\n+ (\"1.0\", (1, 0), None),\n (\"a.b.c\", None, ValueError),\n ],\n )\n"},"problem_statement":{"kind":"string","value":"Better error handling for config errors outside of `plugins`\nExample: having a schema error in `permissions` exits ctl with traceback that's not very telling as to what is failing\r\n\r\nreproduce:\r\n\r\n```\r\npermissions:\r\n namespace: ctl\r\n permission: crud\r\n```"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"be7f350f8f2d92918922d82fce0266fcd72decd2"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_util_versioning.py::test_validate_semantic[1.0-expected4-None]","tests/test_plugin_version.py::test_bump_truncated[standard]"],"string":"[\n \"tests/test_util_versioning.py::test_validate_semantic[1.0-expected4-None]\",\n \"tests/test_plugin_version.py::test_bump_truncated[standard]\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_util_versioning.py::test_bump_semantic[1.2.3-minor-expected1]","tests/test_util_versioning.py::test_validate_semantic[1.0.0-expected0-None]","tests/test_util_versioning.py::test_validate_semantic[version3-expected3-None]","tests/test_util_versioning.py::test_validate_semantic[version1-expected1-None]","tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-dev-expected3]","tests/test_util_versioning.py::test_version_tuple[version0-1.0.0]","tests/test_util_versioning.py::test_validate_semantic[1.0.0.0-expected2-None]","tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-patch-expected2]","tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-major-expected0]","tests/test_util_versioning.py::test_validate_semantic[a.b.c-None-ValueError]","tests/test_plugin_version.py::test_execute_permissions[permission_denied]","tests/test_plugin_version.py::test_tag[standard]","tests/test_plugin_version.py::test_repository[standard]","tests/test_plugin_version.py::test_bump[standard]","tests/test_plugin_version.py::test_execute[standard]","tests/test_plugin_version.py::test_init"],"string":"[\n \"tests/test_util_versioning.py::test_bump_semantic[1.2.3-minor-expected1]\",\n \"tests/test_util_versioning.py::test_validate_semantic[1.0.0-expected0-None]\",\n \"tests/test_util_versioning.py::test_validate_semantic[version3-expected3-None]\",\n \"tests/test_util_versioning.py::test_validate_semantic[version1-expected1-None]\",\n \"tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-dev-expected3]\",\n \"tests/test_util_versioning.py::test_version_tuple[version0-1.0.0]\",\n \"tests/test_util_versioning.py::test_validate_semantic[1.0.0.0-expected2-None]\",\n \"tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-patch-expected2]\",\n \"tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-major-expected0]\",\n \"tests/test_util_versioning.py::test_validate_semantic[a.b.c-None-ValueError]\",\n \"tests/test_plugin_version.py::test_execute_permissions[permission_denied]\",\n \"tests/test_plugin_version.py::test_tag[standard]\",\n \"tests/test_plugin_version.py::test_repository[standard]\",\n \"tests/test_plugin_version.py::test_bump[standard]\",\n \"tests/test_plugin_version.py::test_execute[standard]\",\n \"tests/test_plugin_version.py::test_init\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_short_problem_statement\",\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2019-10-21 11:05:40+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":5,"string":"5"}}},{"rowIdx":6,"cells":{"instance_id":{"kind":"string","value":"3YOURMIND__django-migration-linter-186"},"patch":{"kind":"string","value":"diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml\nindex 085b32c..fef9e0e 100644\n--- a/.github/workflows/ci-build.yml\n+++ b/.github/workflows/ci-build.yml\n@@ -28,7 +28,7 @@ jobs:\n \n strategy:\n matrix:\n- python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9']\n+ python-version: ['3.6', '3.7', '3.8', '3.9']\n \n name: Build with Python ${{ matrix.python-version }}\n steps:\ndiff --git a/CHANGELOG.md b/CHANGELOG.md\nindex d1ec8e5..15fefc0 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,7 +1,8 @@\n-## 4.0.0\n+## 4.0.0 (unreleased)\n \n - Drop support for Python 2.7 and 3.5\n - Drop support for Django 1.11, 2.0, 2.1, 3.0\n+- Fix index creation detection when table is being created in the transaction (issue #178)\n \n ## 3.0.1\n \ndiff --git a/django_migration_linter/sql_analyser/postgresql.py b/django_migration_linter/sql_analyser/postgresql.py\nindex 140aba3..3eb18a5 100644\n--- a/django_migration_linter/sql_analyser/postgresql.py\n+++ b/django_migration_linter/sql_analyser/postgresql.py\n@@ -3,14 +3,32 @@ import re\n from .base import BaseAnalyser\n \n \n+def has_create_index(sql_statements, **kwargs):\n+ regex_result = None\n+ for sql in sql_statements:\n+ regex_result = re.search(r\"CREATE (UNIQUE )?INDEX.*ON (.*) \\(\", sql)\n+ if re.search(\"INDEX CONCURRENTLY\", sql):\n+ regex_result = None\n+ elif regex_result:\n+ break\n+ if not regex_result:\n+ return False\n+\n+ concerned_table = regex_result.group(2)\n+ table_is_added_in_transaction = any(\n+ sql.startswith(\"CREATE TABLE {}\".format(concerned_table))\n+ for sql in sql_statements\n+ )\n+ return not table_is_added_in_transaction\n+\n+\n class PostgresqlAnalyser(BaseAnalyser):\n migration_tests = [\n {\n \"code\": \"CREATE_INDEX\",\n- \"fn\": lambda sql, **kw: re.search(\"CREATE (UNIQUE )?INDEX\", sql)\n- and not re.search(\"INDEX CONCURRENTLY\", sql),\n+ \"fn\": has_create_index,\n \"msg\": \"CREATE INDEX locks table\",\n- \"mode\": \"one_liner\",\n+ \"mode\": \"transaction\",\n \"type\": \"warning\",\n },\n {\n"},"repo":{"kind":"string","value":"3YOURMIND/django-migration-linter"},"base_commit":{"kind":"string","value":"aef3db3e4198d06c38bc4b0874e72ed657891eea"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/unit/test_sql_analyser.py b/tests/unit/test_sql_analyser.py\nindex 00dd50e..65ab7f0 100644\n--- a/tests/unit/test_sql_analyser.py\n+++ b/tests/unit/test_sql_analyser.py\n@@ -233,6 +233,23 @@ class PostgresqlAnalyserTestCase(SqlAnalyserTestCase):\n sql = \"CREATE UNIQUE INDEX title_idx ON films (title);\"\n self.assertWarningSql(sql)\n \n+ def test_create_index_non_concurrently_with_table_creation(self):\n+ sql = [\n+ 'CREATE TABLE \"films\" (\"title\" text);',\n+ 'CREATE INDEX ON \"films\" ((lower(\"title\")));',\n+ ]\n+ self.assertValidSql(sql)\n+ sql = [\n+ 'CREATE TABLE \"some_table\" (\"title\" text);',\n+ 'CREATE INDEX ON \"films\" ((lower(\"title\")));',\n+ ]\n+ self.assertWarningSql(sql)\n+ sql = [\n+ 'CREATE TABLE \"films\" (\"title\" text);',\n+ 'CREATE INDEX ON \"some_table\" ((lower(\"title\")));',\n+ ]\n+ self.assertWarningSql(sql)\n+\n def test_create_index_concurrently(self):\n sql = \"CREATE INDEX CONCURRENTLY ON films (lower(title));\"\n self.assertValidSql(sql)\n"},"problem_statement":{"kind":"string","value":"Linter fails on CREATE INDEX when creating a new table\nHere is an example `CreateModel` from Django:\r\n\r\n```python\r\nmigrations.CreateModel(\r\n name='ShipmentMetadataAlert',\r\n fields=[\r\n ('deleted_at', models.DateTimeField(blank=True, db_index=True, null=True)),\r\n ('created_at', common.fields.CreatedField(default=django.utils.timezone.now, editable=False)),\r\n ('updated_at', common.fields.LastModifiedField(default=django.utils.timezone.now, editable=False)),\r\n ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='ID')),\r\n ('message', models.TextField(blank=True, null=True)),\r\n ('level', models.CharField(blank=True, choices=[('HIGH', 'high'), ('MEDIUM', 'medium'), ('LOW', 'low')], max_length=16, null=True)),\r\n ('type', models.CharField(blank=True, choices=[('MOBILE_DEVICE_ALERT', 'MOBILE_DEVICE_ALERT'), ('NON_ACTIVE_CARRIER', 'NON_ACTIVE_CARRIER'), ('OTHER', 'OTHER')], max_length=32, null=True)),\r\n ('subtype', models.CharField(blank=True, choices=[('DRIVER_PERMISSIONS', 'DRIVER_PERMISSIONS'), ('DRIVER_LOCATION', 'DRIVER_LOCATION'), ('OTHER', 'OTHER')], max_length=32, null=True)),\r\n ('occurred_at', models.DateTimeField(null=True)),\r\n ('clear_alert_job_id', models.UUIDField(default=None, null=True)),\r\n ('metadata', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='alerts', to='shipments.ShipmentMetadata')),\r\n ],\r\n options={\r\n 'abstract': False,\r\n }\r\n)\r\n```\r\n\r\nHere are the SQL statements that this spits out in `sqlmigrate`:\r\n\r\n```sql\r\nBEGIN;\r\n--\r\n-- Create model ShipmentMetadataAlert\r\n--\r\nCREATE TABLE \"shipments_shipmentmetadataalert\" (\"deleted_at\" timestamp with time zone NULL, \"created_at\" timestamp with time zone NOT NULL, \"updated_at\" timestamp with time zone NOT NULL, \"id\" uuid NOT NULL PRIMARY KEY, \"message\" text NULL, \"level\" varchar(16) NULL, \"type\" varchar(32) NULL, \"subtype\" varchar(32) NULL, \"occurred_at\" timestamp with time zone NULL, \"clear_alert_job_id\" uuid NULL, \"metadata_id\" uuid NOT NULL);\r\nALTER TABLE \"shipments_shipmentmetadataalert\" ADD CONSTRAINT \"shipments_shipmentme_metadata_id_f20850e8_fk_shipments\" FOREIGN KEY (\"metadata_id\") REFERENCES \"shipments_shipmentmetadata\" (\"id\") DEFERRABLE INITIALLY DEFERRED;\r\nCREATE INDEX \"shipments_shipmentmetadataalert_deleted_at_c9a93342\" ON \"shipments_shipmentmetadataalert\" (\"deleted_at\");\r\nCREATE INDEX \"shipments_shipmentmetadataalert_metadata_id_f20850e8\" ON \"shipments_shipmentmetadataalert\" (\"metadata_id\");\r\nCOMMIT;\r\n```\r\n \r\nThis is an error from the linter as it outputs the error `CREATE INDEX locks table`. But the table is being created within the migration, it just needs to recognize that.\r\n\r\nIt seems like the `CREATE INDEX` detection should work the same way that the `ADD_UNIQUE` detection works where it detects that the create table is happening in the same migration:\r\n\r\nhttps://github.com/3YOURMIND/django-migration-linter/blob/db71a9db23746f64d41d681f3fecb9b066c87338/django_migration_linter/sql_analyser/base.py#L26-L40"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"aef3db3e4198d06c38bc4b0874e72ed657891eea"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently_with_table_creation"],"string":"[\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently_with_table_creation\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_many_to_many_field","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null_followed_by_default","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_alter_column","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_drop_not_null","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_django_default","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_lib_default","tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_unique_together","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_many_to_many_field","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_not_null","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column_after_django22","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_create_table_with_not_null","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_drop_not_null","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_rename_table","tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_unique_together","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_add_many_to_many_field","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_alter_column","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_concurrently","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_concurrently","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_non_concurrently","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_not_null","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_field_to_not_null_with_dropped_default","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_django_default","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_lib_default","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_not_null_followed_by_default","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_onetoonefield_to_not_null","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_reindex","tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_unique_together"],"string":"[\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_many_to_many_field\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null_followed_by_default\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_alter_column\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_drop_not_null\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_django_default\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_lib_default\",\n \"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_unique_together\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_many_to_many_field\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_not_null\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column_after_django22\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_create_table_with_not_null\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_drop_not_null\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_rename_table\",\n \"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_unique_together\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_add_many_to_many_field\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_alter_column\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_concurrently\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_concurrently\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_non_concurrently\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_not_null\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_field_to_not_null_with_dropped_default\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_django_default\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_lib_default\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_not_null_followed_by_default\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_onetoonefield_to_not_null\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_reindex\",\n \"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_unique_together\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_modified_files\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2021-12-20 21:27:38+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":6,"string":"6"}}},{"rowIdx":7,"cells":{"instance_id":{"kind":"string","value":"3YOURMIND__django-migration-linter-258"},"patch":{"kind":"string","value":"diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 3069d91..beafd65 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -4,10 +4,21 @@\n Instead, the linter crashes and lets the `sqlmigrate` error raise, in order to avoid letting a problematic migration pass.\n One common reason for such an error is the SQL generation which requires the database to be actually migrated in order to fetch actual constraint names from it.\n The crash is a sign to double-check the migration. But if you are certain the migration is safe, you can ignore it (issue #209)\n+\n+Features:\n+\n - Fixed `RunPython` model import check when using a `through` object like `MyModel.many_to_many.through.objects.filter(...)` (issue #218)\n - Mark the `IgnoreMigration` operation as `elidable=True`\n+\n+Bug:\n+\n+- Don't detect not nullable field on partial index creation (issue #250)\n+\n+Miscellaneous:\n+\n - Add support for Python 3.11\n - Add support for Django 4.1\n+- Add support for Django 4.2\n - Drop support for Django 2.2\n - Internally rename \"migration tests\" to \"migration checks\"\n - Add dataclasses internally instead of custom dicts\ndiff --git a/django_migration_linter/sql_analyser/base.py b/django_migration_linter/sql_analyser/base.py\nindex 2fa0646..131652e 100644\n--- a/django_migration_linter/sql_analyser/base.py\n+++ b/django_migration_linter/sql_analyser/base.py\n@@ -40,7 +40,8 @@ def has_not_null_column(sql_statements: list[str], **kwargs) -> bool:\n ends_with_default = False\n return (\n any(\n- re.search(\"(? 1:\n ranges = [collection.format('{range}')\n@@ -270,11 +280,6 @@ class Collection(object):\n \n data['ranges'] = ', '.join(ranges)\n \n- else:\n- data['holes'] = ''\n- data['range'] = ''\n- data['ranges'] = ''\n-\n return pattern.format(**data)\n \n def is_contiguous(self):\n"},"repo":{"kind":"string","value":"4degrees/clique"},"base_commit":{"kind":"string","value":"a89507304acce5931f940c34025a6547fa8227b5"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/test/unit/test_collection.py b/test/unit/test_collection.py\nindex ce4daa7..11cb01e 100644\n--- a/test/unit/test_collection.py\n+++ b/test/unit/test_collection.py\n@@ -2,6 +2,7 @@\n # :copyright: Copyright (c) 2013 Martin Pengelly-Phillips\n # :license: See LICENSE.txt.\n \n+import sys\n import inspect\n \n import pytest\n@@ -242,7 +243,6 @@ def test_remove_non_member():\n (PaddedCollection, '{range}', '1-12'),\n (PaddedCollection, '{ranges}', '1-3, 7, 9-12'),\n (PaddedCollection, '{holes}', '4-6, 8'),\n-\n ])\n def test_format(CollectionCls, pattern, expected):\n '''Format collection according to pattern.'''\n@@ -250,6 +250,25 @@ def test_format(CollectionCls, pattern, expected):\n assert collection.format(pattern) == expected\n \n \n+def test_format_sparse_collection():\n+ '''Format sparse collection without recursion error.'''\n+ recursion_limit = sys.getrecursionlimit()\n+ recursion_error_occurred = False\n+\n+ try:\n+ collection = PaddedCollection(\n+ indexes=set(range(0, recursion_limit * 2, 2))\n+ )\n+ collection.format()\n+ except RuntimeError as error:\n+ if 'maximum recursion depth exceeded' in str(error):\n+ recursion_error_occurred = True\n+ else:\n+ raise\n+\n+ assert not recursion_error_occurred\n+\n+\n @pytest.mark.parametrize(('collection', 'expected'), [\n (PaddedCollection(indexes=set([])), True),\n (PaddedCollection(indexes=set([1])), True),\n"},"problem_statement":{"kind":"string","value":"collection.format hits maximum recursion depth for collections with lots of holes.\nThe following code gives an example.\r\n\r\n```python\r\npaths = [\"name.{0:04d}.jpg\".format(x) for x in range(2000)[::2]]\r\ncollection = clique.assemble(paths)[0][0]\r\ncollection.format(\"{head}####{tail}\")\r\n```"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"a89507304acce5931f940c34025a6547fa8227b5"},"FAIL_TO_PASS":{"kind":"list like","value":["test/unit/test_collection.py::test_format_sparse_collection"],"string":"[\n \"test/unit/test_collection.py::test_format_sparse_collection\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["test/unit/test_collection.py::test_remove_non_member","test/unit/test_collection.py::test_separate[non-contiguous","test/unit/test_collection.py::test_is_compatible[incompatible","test/unit/test_collection.py::test_compatible_merge[complimentary]","test/unit/test_collection.py::test_holes[range","test/unit/test_collection.py::test_comparisons[different","test/unit/test_collection.py::test_format[PaddedCollection-{ranges}-1-3,","test/unit/test_collection.py::test_is_compatible[compatible]","test/unit/test_collection.py::test_holes[empty]","test/unit/test_collection.py::test_contains[non-member","test/unit/test_collection.py::test_compatible_merge[duplicates]","test/unit/test_collection.py::test_is_contiguous[empty]","test/unit/test_collection.py::test_match[padded-collection:unpadded","test/unit/test_collection.py::test_add[unpadded-collection:padded","test/unit/test_collection.py::test_add[padded-collection:unpadded","test/unit/test_collection.py::test_format[PaddedCollection-{head}-/head.]","test/unit/test_collection.py::test_holes[single","test/unit/test_collection.py::test_add[padded-collection:padded","test/unit/test_collection.py::test_is_contiguous[contiguous","test/unit/test_collection.py::test_not_implemented_comparison","test/unit/test_collection.py::test_format[PaddedCollection-{range}-1-12]","test/unit/test_collection.py::test_format[PaddedCollection-{padding}-%04d]","test/unit/test_collection.py::test_format[PaddedCollection-{holes}-4-6,","test/unit/test_collection.py::test_is_contiguous[single]","test/unit/test_collection.py::test_compatible_merge[both","test/unit/test_collection.py::test_match[different","test/unit/test_collection.py::test_str","test/unit/test_collection.py::test_unsettable_indexes","test/unit/test_collection.py::test_format[UnpaddedCollection-{padding}-%d]","test/unit/test_collection.py::test_contains[different","test/unit/test_collection.py::test_incompatible_merge[incompatible","test/unit/test_collection.py::test_format[PaddedCollection-{tail}-.ext]","test/unit/test_collection.py::test_separate[empty]","test/unit/test_collection.py::test_add[unpadded-collection:unpadded","test/unit/test_collection.py::test_repr","test/unit/test_collection.py::test_match[padded-collection:padded","test/unit/test_collection.py::test_change_property[padding-4-^head\\\\.(?P(?P0*)\\\\d+?)\\\\.tail$-head.0001.tail]","test/unit/test_collection.py::test_iterator[padded-collection]","test/unit/test_collection.py::test_comparisons[equal]","test/unit/test_collection.py::test_iterator[unpadded-collection]","test/unit/test_collection.py::test_escaping_expression","test/unit/test_collection.py::test_match[unpadded-collection:unpadded","test/unit/test_collection.py::test_separate[single","test/unit/test_collection.py::test_holes[multiple","test/unit/test_collection.py::test_remove","test/unit/test_collection.py::test_holes[contiguous","test/unit/test_collection.py::test_holes[missing","test/unit/test_collection.py::test_match[unpadded-collection:padded","test/unit/test_collection.py::test_add_duplicate","test/unit/test_collection.py::test_is_contiguous[non-contiguous]","test/unit/test_collection.py::test_contains[valid","test/unit/test_collection.py::test_separate[contiguous"],"string":"[\n \"test/unit/test_collection.py::test_remove_non_member\",\n \"test/unit/test_collection.py::test_separate[non-contiguous\",\n \"test/unit/test_collection.py::test_is_compatible[incompatible\",\n \"test/unit/test_collection.py::test_compatible_merge[complimentary]\",\n \"test/unit/test_collection.py::test_holes[range\",\n \"test/unit/test_collection.py::test_comparisons[different\",\n \"test/unit/test_collection.py::test_format[PaddedCollection-{ranges}-1-3,\",\n \"test/unit/test_collection.py::test_is_compatible[compatible]\",\n \"test/unit/test_collection.py::test_holes[empty]\",\n \"test/unit/test_collection.py::test_contains[non-member\",\n \"test/unit/test_collection.py::test_compatible_merge[duplicates]\",\n \"test/unit/test_collection.py::test_is_contiguous[empty]\",\n \"test/unit/test_collection.py::test_match[padded-collection:unpadded\",\n \"test/unit/test_collection.py::test_add[unpadded-collection:padded\",\n \"test/unit/test_collection.py::test_add[padded-collection:unpadded\",\n \"test/unit/test_collection.py::test_format[PaddedCollection-{head}-/head.]\",\n \"test/unit/test_collection.py::test_holes[single\",\n \"test/unit/test_collection.py::test_add[padded-collection:padded\",\n \"test/unit/test_collection.py::test_is_contiguous[contiguous\",\n \"test/unit/test_collection.py::test_not_implemented_comparison\",\n \"test/unit/test_collection.py::test_format[PaddedCollection-{range}-1-12]\",\n \"test/unit/test_collection.py::test_format[PaddedCollection-{padding}-%04d]\",\n \"test/unit/test_collection.py::test_format[PaddedCollection-{holes}-4-6,\",\n \"test/unit/test_collection.py::test_is_contiguous[single]\",\n \"test/unit/test_collection.py::test_compatible_merge[both\",\n \"test/unit/test_collection.py::test_match[different\",\n \"test/unit/test_collection.py::test_str\",\n \"test/unit/test_collection.py::test_unsettable_indexes\",\n \"test/unit/test_collection.py::test_format[UnpaddedCollection-{padding}-%d]\",\n \"test/unit/test_collection.py::test_contains[different\",\n \"test/unit/test_collection.py::test_incompatible_merge[incompatible\",\n \"test/unit/test_collection.py::test_format[PaddedCollection-{tail}-.ext]\",\n \"test/unit/test_collection.py::test_separate[empty]\",\n \"test/unit/test_collection.py::test_add[unpadded-collection:unpadded\",\n \"test/unit/test_collection.py::test_repr\",\n \"test/unit/test_collection.py::test_match[padded-collection:padded\",\n \"test/unit/test_collection.py::test_change_property[padding-4-^head\\\\\\\\.(?P(?P0*)\\\\\\\\d+?)\\\\\\\\.tail$-head.0001.tail]\",\n \"test/unit/test_collection.py::test_iterator[padded-collection]\",\n \"test/unit/test_collection.py::test_comparisons[equal]\",\n \"test/unit/test_collection.py::test_iterator[unpadded-collection]\",\n \"test/unit/test_collection.py::test_escaping_expression\",\n \"test/unit/test_collection.py::test_match[unpadded-collection:unpadded\",\n \"test/unit/test_collection.py::test_separate[single\",\n \"test/unit/test_collection.py::test_holes[multiple\",\n \"test/unit/test_collection.py::test_remove\",\n \"test/unit/test_collection.py::test_holes[contiguous\",\n \"test/unit/test_collection.py::test_holes[missing\",\n \"test/unit/test_collection.py::test_match[unpadded-collection:padded\",\n \"test/unit/test_collection.py::test_add_duplicate\",\n \"test/unit/test_collection.py::test_is_contiguous[non-contiguous]\",\n \"test/unit/test_collection.py::test_contains[valid\",\n \"test/unit/test_collection.py::test_separate[contiguous\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_short_problem_statement\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2016-04-30 17:21:04+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":9,"string":"9"}}},{"rowIdx":10,"cells":{"instance_id":{"kind":"string","value":"6si__shipwright-79"},"patch":{"kind":"string","value":"diff --git a/CHANGES.rst b/CHANGES.rst\nindex f034d37..89cf5f1 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -1,7 +1,8 @@\n 0.5.1 (unreleased)\n ------------------\n \n-- Nothing changed yet.\n+- Add --pull-cache to pull images from repository before building.\n+ (`Issue #49 `_).\n \n \n 0.5.0 (2016-08-19)\ndiff --git a/shipwright/base.py b/shipwright/base.py\nindex 213d597..421f1af 100644\n--- a/shipwright/base.py\n+++ b/shipwright/base.py\n@@ -4,10 +4,11 @@ from . import build, dependencies, docker, push\n \n \n class Shipwright(object):\n- def __init__(self, source_control, docker_client, tags):\n+ def __init__(self, source_control, docker_client, tags, pull_cache=False):\n self.source_control = source_control\n self.docker_client = docker_client\n self.tags = tags\n+ self._pull_cache = pull_cache\n \n def targets(self):\n return self.source_control.targets()\n@@ -18,7 +19,10 @@ class Shipwright(object):\n return self._build(this_ref_str, targets)\n \n def _build(self, this_ref_str, targets):\n- for evt in build.do_build(self.docker_client, this_ref_str, targets):\n+ client = self.docker_client\n+ pull_cache = self._pull_cache\n+ ref = this_ref_str\n+ for evt in build.do_build(client, ref, targets, pull_cache):\n yield evt\n \n # now that we're built and tagged all the images.\ndiff --git a/shipwright/build.py b/shipwright/build.py\nindex 707d4f9..4ee1558 100644\n--- a/shipwright/build.py\n+++ b/shipwright/build.py\n@@ -13,7 +13,7 @@ def _merge(d1, d2):\n return d\n \n \n-def do_build(client, build_ref, targets):\n+def do_build(client, build_ref, targets, pull_cache):\n \"\"\"\n Generic function for building multiple images while\n notifying a callback function with output produced.\n@@ -39,11 +39,11 @@ def do_build(client, build_ref, targets):\n parent_ref = None\n if target.parent:\n parent_ref = build_index.get(target.parent)\n- for evt in build(client, parent_ref, target):\n+ for evt in build(client, parent_ref, target, pull_cache):\n yield evt\n \n \n-def build(client, parent_ref, image):\n+def build(client, parent_ref, image, pull_cache):\n \"\"\"\n builds the given image tagged with and ensures that\n it depends on it's parent if it's part of this build group (shares\n@@ -62,7 +62,25 @@ def build(client, parent_ref, image):\n \n built_tags = docker.last_built_from_docker(client, image.name)\n if image.ref in built_tags:\n- return []\n+ return\n+\n+ if pull_cache:\n+ pull_evts = client.pull(\n+ repository=image.name,\n+ tag=image.ref,\n+ stream=True,\n+ )\n+\n+ failed = False\n+ for evt in pull_evts:\n+ event = process_event_(evt)\n+ if 'error' in event:\n+ failed = True\n+ else:\n+ yield event\n+\n+ if not failed:\n+ return\n \n build_evts = client.build(\n fileobj=mkcontext(parent_ref, image.path),\n@@ -73,4 +91,5 @@ def build(client, parent_ref, image):\n dockerfile=os.path.basename(image.path),\n )\n \n- return (process_event_(evt) for evt in build_evts)\n+ for evt in build_evts:\n+ yield process_event_(evt)\ndiff --git a/shipwright/cli.py b/shipwright/cli.py\nindex 24f6f78..82eaf50 100644\n--- a/shipwright/cli.py\n+++ b/shipwright/cli.py\n@@ -109,6 +109,11 @@ def argparser():\n help='Build working tree, including uncommited and untracked changes',\n action="https://huggingface.co/datasets/nebius/store_true",\n )\n+ common.add_argument(\n+ '--pull-cache',\n+ help='When building try to pull previously built images',\n+ action="https://huggingface.co/datasets/nebius/store_true",\n+ )\n a_arg(\n common, '-d', '--dependants',\n help='Build DEPENDANTS and all its dependants',\n@@ -157,7 +162,6 @@ def old_style_arg_dict(namespace):\n '--exclude': _flatten(ns.exclude),\n '--help': False,\n '--no-build': getattr(ns, 'no_build', False),\n- '--dirty': getattr(ns, 'dirty', False),\n '--upto': _flatten(ns.upto),\n '--x-assert-hostname': ns.x_assert_hostname,\n '-H': ns.docker_host,\n@@ -237,8 +241,10 @@ def run(path, arguments, client_cfg, environ, new_style_args=None):\n \n if new_style_args is None:\n dirty = False\n+ pull_cache = False\n else:\n dirty = new_style_args.dirty\n+ pull_cache = new_style_args.pull_cache\n \n namespace = config['namespace']\n name_map = config.get('names', {})\n@@ -249,7 +255,7 @@ def run(path, arguments, client_cfg, environ, new_style_args=None):\n 'to commit these changes, re-run with the --dirty flag.'\n )\n \n- sw = Shipwright(scm, client, arguments['tags'])\n+ sw = Shipwright(scm, client, arguments['tags'], pull_cache)\n command = getattr(sw, command_name)\n \n show_progress = sys.stdout.isatty()\n"},"repo":{"kind":"string","value":"6si/shipwright"},"base_commit":{"kind":"string","value":"7d3ccf39acc79bb6d33a787e773227358764dd2c"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/integration/test_docker_builds.py b/tests/integration/test_docker_builds.py\nindex 00aa6be..3a22616 100644\n--- a/tests/integration/test_docker_builds.py\n+++ b/tests/integration/test_docker_builds.py\n@@ -12,7 +12,7 @@ from .utils import commit_untracked, create_repo, get_defaults\n \n \n def default_args():\n- return argparse.Namespace(dirty=False)\n+ return argparse.Namespace(dirty=False, pull_cache=False)\n \n \n def test_sample(tmpdir, docker_client):\n@@ -734,3 +734,85 @@ def test_build_with_repo_digest(tmpdir, docker_client, registry):\n )\n for image in old_images:\n cli.remove_image(image, force=True)\n+\n+\n+def test_docker_buld_pull_cache(tmpdir, docker_client, registry):\n+ path = str(tmpdir.join('shipwright-localhost-sample'))\n+ source = pkg_resources.resource_filename(\n+ __name__,\n+ 'examples/shipwright-localhost-sample',\n+ )\n+ repo = create_repo(path, source)\n+ tag = repo.head.ref.commit.hexsha[:12]\n+\n+ client_cfg = docker_utils.kwargs_from_env()\n+ cli = docker_client\n+\n+ defaults = get_defaults()\n+ defaults['push'] = True\n+ try:\n+ shipw_cli.run(\n+ path=path,\n+ client_cfg=client_cfg,\n+ arguments=defaults,\n+ environ={},\n+ )\n+\n+ # Remove the build images:\n+ old_images = (\n+ cli.images(name='localhost:5000/service1', quiet=True) +\n+ cli.images(name='localhost:5000/shared', quiet=True) +\n+ cli.images(name='localhost:5000/base', quiet=True)\n+ )\n+ for image in old_images:\n+ cli.remove_image(image, force=True)\n+\n+ images_after_delete = (\n+ cli.images(name='localhost:5000/service1') +\n+ cli.images(name='localhost:5000/shared') +\n+ cli.images(name='localhost:5000/base')\n+ )\n+ assert images_after_delete == []\n+\n+ args = default_args()\n+ args.pull_cache = True\n+\n+ shipw_cli.run(\n+ path=path,\n+ client_cfg=client_cfg,\n+ arguments=defaults,\n+ environ={},\n+ new_style_args=args,\n+ )\n+\n+ service1, shared, base = (\n+ cli.images(name='localhost:5000/service1') +\n+ cli.images(name='localhost:5000/shared') +\n+ cli.images(name='localhost:5000/base')\n+ )\n+\n+ assert set(service1['RepoTags']) == {\n+ 'localhost:5000/service1:master',\n+ 'localhost:5000/service1:latest',\n+ 'localhost:5000/service1:' + tag,\n+ }\n+\n+ assert set(shared['RepoTags']) == {\n+ 'localhost:5000/shared:master',\n+ 'localhost:5000/shared:latest',\n+ 'localhost:5000/shared:' + tag,\n+ }\n+\n+ assert set(base['RepoTags']) == {\n+ 'localhost:5000/base:master',\n+ 'localhost:5000/base:latest',\n+ 'localhost:5000/base:' + tag,\n+ }\n+ finally:\n+ old_images = (\n+ cli.images(name='localhost:5000/service1', quiet=True) +\n+ cli.images(name='localhost:5000/shared', quiet=True) +\n+ cli.images(name='localhost:5000/base', quiet=True)\n+ )\n+ for image in old_images:\n+ cli.remove_image(image, force=True)\ndiff --git a/tests/test_cli.py b/tests/test_cli.py\nindex 260eb92..064f931 100644\n--- a/tests/test_cli.py\n+++ b/tests/test_cli.py\n@@ -16,7 +16,6 @@ def get_defaults():\n '--exclude': [],\n '--help': False,\n '--no-build': False,\n- '--dirty': False,\n '--upto': [],\n '--x-assert-hostname': False,\n '-H': None,\n@@ -90,7 +89,6 @@ def test_args():\n '--exclude': [],\n '--help': False,\n '--no-build': False,\n- '--dirty': False,\n '--upto': [],\n '--x-assert-hostname': True,\n '-H': None,\n@@ -105,7 +103,7 @@ def test_args_2():\n args = [\n '--account=x', '--x-assert-hostname', 'build',\n '-d', 'foo', 'bar',\n- '-t', 'foo', '--dirty',\n+ '-t', 'foo', '--dirty', '--pull-cache',\n ]\n parser = cli.argparser()\n arguments = cli.old_style_arg_dict(parser.parse_args(args))\n@@ -118,7 +116,6 @@ def test_args_2():\n '--exclude': [],\n '--help': False,\n '--no-build': False,\n- '--dirty': True,\n '--upto': [],\n '--x-assert-hostname': True,\n '-H': None,\n@@ -142,7 +139,6 @@ def test_args_base():\n '--exclude': [],\n '--help': False,\n '--no-build': False,\n- '--dirty': False,\n '--upto': [],\n '--x-assert-hostname': False,\n '-H': None,\n"},"problem_statement":{"kind":"string","value":"docker pull all images for current branch and master before building\nBecause our buildserver forgets the docker cache between builds we pull the previous build for all the images.\r\n\r\nit would be great if we could get shipwright to do it.\r\n\r\nOtherwise a command like \"shipright images\" which lists all the images that shipwright *would* build would let us write our own command to do this."},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"7d3ccf39acc79bb6d33a787e773227358764dd2c"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_cli.py::test_args","tests/test_cli.py::test_args_2","tests/test_cli.py::test_args_base"],"string":"[\n \"tests/test_cli.py::test_args\",\n \"tests/test_cli.py::test_args_2\",\n \"tests/test_cli.py::test_args_base\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/integration/test_docker_builds.py::test_dirty_fails_without_flag","tests/test_cli.py::test_without_json_manifest","tests/test_cli.py::test_push_also_builds","tests/test_cli.py::test_assert_hostname"],"string":"[\n \"tests/integration/test_docker_builds.py::test_dirty_fails_without_flag\",\n \"tests/test_cli.py::test_without_json_manifest\",\n \"tests/test_cli.py::test_push_also_builds\",\n \"tests/test_cli.py::test_assert_hostname\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2016-08-22 09:51:49+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":10,"string":"10"}}},{"rowIdx":11,"cells":{"instance_id":{"kind":"string","value":"ARM-software__mango-11"},"patch":{"kind":"string","value":"diff --git a/mango/domain/distribution.py b/mango/domain/distribution.py\nindex 4f5b69d..bb9e14d 100644\n--- a/mango/domain/distribution.py\n+++ b/mango/domain/distribution.py\n@@ -1,49 +1,5 @@\n-# Defining loguniform distribution\n-\"\"\"\n-Credits: Extended from the original definition of rvs function in scipy/scipy/stats/_distn_infrastructure.py\n-for the class rv_generic and the _rvs function for the uniform distribution from\n-scipy/scipy/stats/_continuous_distns.py\n-\"\"\"\n+from scipy.stats import loguniform as _loguniform\n \n-from scipy.stats import rv_continuous\n-import numpy as np\n \n-\n-class log_uniform_gen(rv_continuous):\n- \"\"\"A log uniform distribution with base 10\n- \"\"\"\n-\n- def __init__(self, *args, **kwargs):\n- self.base = 10\n- super(log_uniform_gen, self).__init__(*args, **kwargs)\n-\n- def _log(self, x):\n- return np.log(x) / np.log(self.base)\n-\n- def _argcheck(self, a, b):\n- return (a > 0) & (b > a)\n-\n- def _get_support(self, a, b):\n- return a, b\n-\n- def _pdf(self, x, a, b):\n- # reciprocal.pdf(x, a, b) = 1 / (x*log(b/a))\n- return 1.0 / (x * self._log(b * 1.0 / a))\n-\n- def _logpdf(self, x, a, b):\n- return np.log(x) - np.log(self._log(b * 1.0 / a))\n-\n- def _cdf(self, x, a, b):\n- return (self._log(x) - self._log(a)) / self._log(b * 1.0 / a)\n-\n- def _ppf(self, q, a, b):\n- return a*pow(b*1.0/a, q)\n-\n- def _munp(self, n, a, b):\n- return 1.0/self._log(b*1.0/a) / n * (pow(b*1.0, n) - pow(a*1.0, n))\n-\n- def _entropy(self, a, b):\n- return 0.5*np.log(a*b)+np.log(self._log(b*1.0/a))\n-\n-\n-loguniform = log_uniform_gen(name='loguniform')\n\\ No newline at end of file\n+def loguniform(a, b):\n+ return _loguniform(10 ** a, 10 ** (a + b))\n"},"repo":{"kind":"string","value":"ARM-software/mango"},"base_commit":{"kind":"string","value":"e2d4fd8ae61d2ab8921c94fa2f4dafc1119dbab2"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/mango/tests/test_domain_space.py b/mango/tests/test_domain_space.py\nindex f393f2b..58fcbc6 100644\n--- a/mango/tests/test_domain_space.py\n+++ b/mango/tests/test_domain_space.py\n@@ -2,6 +2,7 @@ import numpy as np\n from scipy.stats import uniform, loguniform\n \n from mango.domain.domain_space import domain_space\n+from mango.domain.distribution import loguniform as mango_loguniform\n \n \n def test_domain():\n@@ -34,6 +35,15 @@ def test_domain():\n assert (sample[param] in params[param])\n \n \n+def test_mango_loguniform():\n+ space = {\n+ 'a': mango_loguniform(-3, 6)\n+ }\n+ ds = domain_space(space, domain_size=1000)\n+ samples = ds.get_domain()\n+ assert all(1e-3 < sample['a'] < 1e3 for sample in samples)\n+\n+\n def test_gp_samples_to_params():\n space = {\n 'a': range(10),\n@@ -91,7 +101,7 @@ def test_gp_space():\n assert (X >= 0.0).all()\n assert (X[:, 0] == 1.).all() # a\n assert (X[:, 1] == 0.).all() # b\n- assert np.isin(X[:, 2], [0.0, 0.5, 1.0]).all() # c\n+ assert np.isin(X[:, 2], [0.0, 0.5, 1.0]).all() # c\n assert np.isin(X[:, 4:7], np.eye(3)).all() # e\n assert X.shape == (ds.domain_size, 12)\n \n@@ -110,5 +120,3 @@ def test_gp_space():\n \n X2 = ds.convert_to_gp(params)\n assert np.isclose(X2, X).all()\n-\n-\n"},"problem_statement":{"kind":"string","value":"Domain error in loguniform\nHi, \r\nseems that there is a problem with `loguniform` when one of its argument is negative. For example, my code is runnable when the first argument of `loguniform` is positive and it generates domain error when the first argument is a negative number. Any thought on this?\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"e2d4fd8ae61d2ab8921c94fa2f4dafc1119dbab2"},"FAIL_TO_PASS":{"kind":"list like","value":["mango/tests/test_domain_space.py::test_mango_loguniform"],"string":"[\n \"mango/tests/test_domain_space.py::test_mango_loguniform\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["mango/tests/test_domain_space.py::test_domain","mango/tests/test_domain_space.py::test_gp_samples_to_params","mango/tests/test_domain_space.py::test_gp_space"],"string":"[\n \"mango/tests/test_domain_space.py::test_domain\",\n \"mango/tests/test_domain_space.py::test_gp_samples_to_params\",\n \"mango/tests/test_domain_space.py::test_gp_space\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [],\n \"has_test_patch\": true,\n \"is_lite\": true\n}"},"created_at":{"kind":"string","value":"2020-06-11 05:56:07+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":11,"string":"11"}}},{"rowIdx":12,"cells":{"instance_id":{"kind":"string","value":"ARM-software__mango-47"},"patch":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex 16b11cb..2f14c63 100644\n--- a/README.md\n+++ b/README.md\n@@ -352,8 +352,9 @@ The configuration parameters are:\n ...\n return True/False\n ```\n-Early stopping is one of Mango's important features that allow to early terminate the current parallel search based on the custom user-designed criteria, such as the total optimization time spent, current validation accuracy achieved, or improvements in the past few iterations. For usage see early stopping examples [notebook](https://github.com/ARM-software/mango/blob/master/examples/EarlyStopping.ipynb).\n+ Early stopping is one of Mango's important features that allow to early terminate the current parallel search based on the custom user-designed criteria, such as the total optimization time spent, current validation accuracy achieved, or improvements in the past few iterations. For usage see early stopping examples [notebook](https://github.com/ARM-software/mango/blob/master/examples/EarlyStopping.ipynb).\n \n+- initial_custom: A list of initial evaluation points to warm up the optimizer instead of random sampling. For example, for a search space with two parameters `x1` and `x2` the input could be: `[{'x1': 10, 'x2': -5}, {'x1': 0, 'x2': 10}]`. This allows the user to customize the initial evaluation points and therefore guide the optimization process. If this option is given then `initial_random` is ignored. \n \n The default configuration parameters can be modified, as shown below. Only the parameters whose values need to adjusted can be passed as the dictionary.\n \ndiff --git a/mango/tuner.py b/mango/tuner.py\nindex 360a859..97f02a1 100644\n--- a/mango/tuner.py\n+++ b/mango/tuner.py\n@@ -29,6 +29,7 @@ class Tuner:\n class Config:\n domain_size: int = None\n initial_random: int = 2\n+ initial_custom: dict = None\n num_iteration: int = 20\n batch_size: int = 1\n optimizer: str = 'Bayesian'\n@@ -151,25 +152,35 @@ class Tuner:\n self.maximize_objective = False\n return self.run()\n \n+\n+ def run_initial(self):\n+ if self.config.initial_custom is not None:\n+ X_tried = copy.deepcopy(self.config.initial_custom)\n+ X_list, Y_list = self.runUserObjective(X_tried)\n+ else:\n+ # getting first few random values\n+ X_tried = self.ds.get_random_sample(self.config.initial_random)\n+ X_list, Y_list = self.runUserObjective(X_tried)\n+\n+ # in case initial random results are invalid try different samples\n+ n_tries = 1\n+ while len(Y_list) < self.config.initial_random and n_tries < 3:\n+ X_tried2 = self.ds.get_random_sample(self.config.initial_random - len(Y_list))\n+ X_list2, Y_list2 = self.runUserObjective(X_tried2)\n+ X_tried2.extend(X_tried2)\n+ X_list = np.append(X_list, X_list2)\n+ Y_list = np.append(Y_list, Y_list2)\n+ n_tries += 1\n+\n+ if len(Y_list) == 0:\n+ raise ValueError(\"No valid configuration found to initiate the Bayesian Optimizer\")\n+ return X_list, Y_list, X_tried\n+\n def runBayesianOptimizer(self):\n results = dict()\n \n- # getting first few random values\n- random_hyper_parameters = self.ds.get_random_sample(self.config.initial_random)\n- X_list, Y_list = self.runUserObjective(random_hyper_parameters)\n-\n- # in case initial random results are invalid try different samples\n- n_tries = 1\n- while len(Y_list) < self.config.initial_random and n_tries < 3:\n- random_hps = self.ds.get_random_sample(self.config.initial_random - len(Y_list))\n- X_list2, Y_list2 = self.runUserObjective(random_hps)\n- random_hyper_parameters.extend(random_hps)\n- X_list = np.append(X_list, X_list2)\n- Y_list = np.append(Y_list, Y_list2)\n- n_tries += 1\n+ X_list, Y_list, X_tried = self.run_initial()\n \n- if len(Y_list) == 0:\n- raise ValueError(\"No valid configuration found to initiate the Bayesian Optimizer\")\n \n # evaluated hyper parameters are used\n X_init = self.ds.convert_GP_space(X_list)\n@@ -186,7 +197,7 @@ class Tuner:\n X_sample = X_init\n Y_sample = Y_init\n \n- hyper_parameters_tried = random_hyper_parameters\n+ hyper_parameters_tried = X_tried\n objective_function_values = Y_list\n surrogate_values = Y_list\n \n"},"repo":{"kind":"string","value":"ARM-software/mango"},"base_commit":{"kind":"string","value":"a71bc007a0c4e39462fd1810cdbcf99c4e854679"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/test_tuner.py b/tests/test_tuner.py\nindex 24e7c99..98e5fbd 100644\n--- a/tests/test_tuner.py\n+++ b/tests/test_tuner.py\n@@ -14,7 +14,6 @@ import numpy as np\n from mango.domain.domain_space import domain_space\n from mango import Tuner, scheduler\n from scipy.stats import uniform\n-from mango.domain.distribution import loguniform\n \n # Simple param_dict\n param_dict = {\"a\": uniform(0, 1), # uniform distribution\n@@ -125,7 +124,7 @@ def test_rosenbrock():\n results.append(result)\n return results\n \n- tuner = Tuner(param_dict, objfunc, conf_dict=dict(domain_size=100000))\n+ tuner = Tuner(param_dict, objfunc, conf_dict=dict(domain_size=100000, num_iteration=40))\n results = tuner.run()\n \n print('best hyper parameters:', results['best_params'])\n@@ -190,6 +189,40 @@ def test_convex():\n assert abs(results['best_params']['y'] - y_opt) <= 3\n \n \n+def test_initial_custom():\n+ param_dict = {\n+ 'x': range(-100, 10),\n+ 'y': range(-10, 20),\n+ }\n+\n+ x_opt = 0\n+ y_opt = 0\n+\n+ def objfunc(args_list):\n+ results = []\n+ for hyper_par in args_list:\n+ x = hyper_par['x']\n+ y = hyper_par['y']\n+ result = (x ** 2 + y ** 2) / 1e4\n+ results.append(result)\n+ return results\n+\n+ config = dict(initial_custom=[dict(x=-100, y=20),\n+ dict(x=10, y=20)]\n+ )\n+\n+ tuner = Tuner(param_dict, objfunc, conf_dict=config)\n+ results = tuner.minimize()\n+\n+ print('best hyper parameters:', results['best_params'])\n+ print('best Accuracy:', results['best_objective'])\n+\n+ assert abs(results['best_params']['x'] - x_opt) <= 3\n+ assert abs(results['best_params']['y'] - y_opt) <= 3\n+ assert results['random_params'][0] == config['initial_custom'][0]\n+ assert results['random_params'][1] == config['initial_custom'][1]\n+\n+\n def test_local_scheduler():\n param_space = dict(x=range(-10, 10),\n y=range(-10, 10))\n"},"problem_statement":{"kind":"string","value":"Is it possible to add an initial data point?\nThe way Im currently using mango, I will always have a first run with good defaults. Is it possible to use this information somehow? I have quite wide ranges for my hyper parameters, and I think this would help a lot."},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"a71bc007a0c4e39462fd1810cdbcf99c4e854679"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/test_tuner.py::test_initial_custom"],"string":"[\n \"tests/test_tuner.py::test_initial_custom\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/test_tuner.py::test_domain","tests/test_tuner.py::test_tuner","tests/test_tuner.py::test_rosenbrock","tests/test_tuner.py::test_config","tests/test_tuner.py::test_convex","tests/test_tuner.py::test_six_hump","tests/test_tuner.py::test_celery_scheduler","tests/test_tuner.py::test_custom_scheduler","tests/test_tuner.py::test_early_stopping_simple","tests/test_tuner.py::test_early_stopping_complex"],"string":"[\n \"tests/test_tuner.py::test_domain\",\n \"tests/test_tuner.py::test_tuner\",\n \"tests/test_tuner.py::test_rosenbrock\",\n \"tests/test_tuner.py::test_config\",\n \"tests/test_tuner.py::test_convex\",\n \"tests/test_tuner.py::test_six_hump\",\n \"tests/test_tuner.py::test_celery_scheduler\",\n \"tests/test_tuner.py::test_custom_scheduler\",\n \"tests/test_tuner.py::test_early_stopping_simple\",\n \"tests/test_tuner.py::test_early_stopping_complex\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_modified_files\",\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2022-03-02 18:10:44+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":12,"string":"12"}}},{"rowIdx":13,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__greentea-237"},"patch":{"kind":"string","value":"diff --git a/mbed_greentea/mbed_report_api.py b/mbed_greentea/mbed_report_api.py\nindex da3f0d9..82acb5c 100644\n--- a/mbed_greentea/mbed_report_api.py\n+++ b/mbed_greentea/mbed_report_api.py\n@@ -38,6 +38,13 @@ def exporter_json(test_result_ext, test_suite_properties=None):\n @details This is a machine friendly format\n \"\"\"\n import json\n+ for target in test_result_ext.values():\n+ for suite in target.values():\n+ try:\n+ suite[\"single_test_output\"] = suite[\"single_test_output\"]\\\n+ .decode(\"unicode_escape\")\n+ except KeyError:\n+ pass\n return json.dumps(test_result_ext, indent=4)\n \n \n@@ -211,7 +218,10 @@ def exporter_testcase_junit(test_result_ext, test_suite_properties=None):\n test_cases.append(tc)\n \n ts_name = target_name\n- test_build_properties = test_suite_properties[target_name] if target_name in test_suite_properties else None\n+ if test_suite_properties and target_name in test_suite_properties:\n+ test_build_properties = test_suite_properties[target_name] \n+ else:\n+ test_build_properties = None\n ts = TestSuite(ts_name, test_cases, properties=test_build_properties)\n test_suites.append(ts)\n \n@@ -584,7 +594,9 @@ def get_result_overlay_dropdowns(result_div_id, test_results):\n result_output_div_id = \"%s_output\" % result_div_id\n result_output_dropdown = get_dropdown_html(result_output_div_id,\n \"Test Output\",\n- test_results['single_test_output'].rstrip(\"\\n\"),\n+ test_results['single_test_output']\n+ .decode(\"unicode-escape\")\n+ .rstrip(\"\\n\"),\n output_text=True)\n \n # Add a dropdown for the testcases if they are present\n@@ -740,10 +752,14 @@ def exporter_html(test_result_ext, test_suite_properties=None):\n test_results['single_test_count'] += 1\n \n result_class = get_result_colour_class(test_results['single_test_result'])\n+ try:\n+ percent_pass = int((test_results['single_test_passes']*100.0)/test_results['single_test_count'])\n+ except ZeroDivisionError:\n+ percent_pass = 100\n this_row += result_cell_template % (result_class,\n result_div_id,\n test_results['single_test_result'],\n- int((test_results['single_test_passes']*100.0)/test_results['single_test_count']),\n+ percent_pass,\n test_results['single_test_passes'],\n test_results['single_test_count'],\n result_overlay)\n"},"repo":{"kind":"string","value":"ARMmbed/greentea"},"base_commit":{"kind":"string","value":"86f5ec3211a8f7f324bcdd3201012945ee0534ac"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/test/report_api.py b/test/report_api.py\nnew file mode 100644\nindex 0000000..122e26e\n--- /dev/null\n+++ b/test/report_api.py\n@@ -0,0 +1,56 @@\n+#!/usr/bin/env python\n+\"\"\"\n+mbed SDK\n+Copyright (c) 2017 ARM Limited\n+\n+Licensed under the Apache License, Version 2.0 (the \"License\");\n+you may not use this file except in compliance with the License.\n+You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+Unless required by applicable law or agreed to in writing, software\n+distributed under the License is distributed on an \"AS IS\" BASIS,\n+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+See the License for the specific language governing permissions and\n+limitations under the License.\n+\"\"\"\n+\n+import unittest\n+from mock import patch\n+\n+from mbed_greentea.mbed_report_api import exporter_html, \\\n+ exporter_memory_metrics_csv, exporter_testcase_junit, \\\n+ exporter_testcase_text, exporter_text, exporter_json\n+\n+\n+class ReportEmitting(unittest.TestCase):\n+\n+\n+ report_fns = [exporter_html, exporter_memory_metrics_csv,\n+ exporter_testcase_junit, exporter_testcase_text,\n+ exporter_text, exporter_json]\n+ def test_report_zero_tests(self):\n+ test_data = {}\n+ for report_fn in self.report_fns:\n+ report_fn(test_data)\n+\n+ def test_report_zero_testcases(self):\n+ test_data = {\n+ 'k64f-gcc_arm': {\n+ 'garbage_test_suite' :{\n+ u'single_test_result': u'NOT_RAN',\n+ u'elapsed_time': 0.0,\n+ u'build_path': u'N/A',\n+ u'build_path_abs': u'N/A',\n+ u'copy_method': u'N/A',\n+ u'image_path': u'N/A',\n+ u'single_test_output': b'N/A',\n+ u'platform_name': u'k64f',\n+ u'test_bin_name': u'N/A',\n+ u'testcase_result': {},\n+ }\n+ }\n+ }\n+ for report_fn in self.report_fns:\n+ report_fn(test_data)\n"},"problem_statement":{"kind":"string","value":"mbedgt crash with float division by zero\nHi\r\n\r\nHere is my command:\r\nmbedgt -V -v -t NUCLEO_F401RE-ARM,NUCLEO_F401RE-GCC_ARM,NUCLEO_F401RE-IAR,NUCLEO_F410RB-ARM,NUCLEO_F410RB-GCC_ARM,NUCLEO_F410RB-IAR,NUCLEO_F411RE-ARM,NUCLEO_F411RE-GCC_ARM,NUCLEO_F411RE-IAR --report-html=/c/xxx.html\r\n\r\nIt has crashed:\r\n\r\n...\r\nmbedgt: all tests finished!\r\nmbedgt: shuffle seed: 0.3680156551\r\nmbedgt: exporting to HTML file \r\nmbedgt: unexpected error:\r\n\tfloat division by zero\r\nTraceback (most recent call last):\r\n File \"C:\\Python27\\Scripts\\mbedgt-script.py\", line 11, in \r\n load_entry_point('mbed-greentea==1.2.6', 'console_scripts', 'mbedgt')()\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_greentea_cli.py\", line 401, in main\r\n cli_ret = main_cli(opts, args)\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_greentea_cli.py\", line 1050, in main_cli\r\n html_report = exporter_html(test_report)\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_report_api.py\", line 747, in exporter_html\r\n int((test_results['single_test_passes']*100.0)/test_results['single_test_count']),\r\nZeroDivisionError: float division by zero\r\n\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"86f5ec3211a8f7f324bcdd3201012945ee0534ac"},"FAIL_TO_PASS":{"kind":"list like","value":["test/report_api.py::ReportEmitting::test_report_zero_testcases"],"string":"[\n \"test/report_api.py::ReportEmitting::test_report_zero_testcases\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["test/report_api.py::ReportEmitting::test_report_zero_tests"],"string":"[\n \"test/report_api.py::ReportEmitting::test_report_zero_tests\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_hunks\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2017-09-25 13:51:40+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":13,"string":"13"}}},{"rowIdx":14,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__greentea-243"},"patch":{"kind":"string","value":"diff --git a/mbed_greentea/mbed_report_api.py b/mbed_greentea/mbed_report_api.py\nindex 166bc29..22a3778 100644\n--- a/mbed_greentea/mbed_report_api.py\n+++ b/mbed_greentea/mbed_report_api.py\n@@ -42,7 +42,7 @@ def exporter_json(test_result_ext, test_suite_properties=None):\n for suite in target.values():\n try:\n suite[\"single_test_output\"] = suite[\"single_test_output\"]\\\n- .decode(\"unicode_escape\")\n+ .decode(\"utf-8\", \"replace\")\n except KeyError:\n pass\n return json.dumps(test_result_ext, indent=4)\n@@ -603,7 +603,7 @@ def get_result_overlay_dropdowns(result_div_id, test_results):\n result_output_dropdown = get_dropdown_html(result_output_div_id,\n \"Test Output\",\n test_results['single_test_output']\n- .decode(\"unicode-escape\")\n+ .decode(\"utf-8\", \"replace\")\n .rstrip(\"\\n\"),\n output_text=True)\n \n"},"repo":{"kind":"string","value":"ARMmbed/greentea"},"base_commit":{"kind":"string","value":"8f7b28f8ec739156d238304fa4f5f2e5156536f5"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/test/report_api.py b/test/report_api.py\nindex 122e26e..2a4275f 100644\n--- a/test/report_api.py\n+++ b/test/report_api.py\n@@ -45,7 +45,7 @@ class ReportEmitting(unittest.TestCase):\n u'build_path_abs': u'N/A',\n u'copy_method': u'N/A',\n u'image_path': u'N/A',\n- u'single_test_output': b'N/A',\n+ u'single_test_output': b'\\x80abc\\uXXXX' ,\n u'platform_name': u'k64f',\n u'test_bin_name': u'N/A',\n u'testcase_result': {},\n"},"problem_statement":{"kind":"string","value":"mbedgt crash with UnicodeDecodeError\nHi\r\n\r\nI am sorry, but I still get some crash with the new green tea version ...\r\n\r\nmbedgt: exporting to HTML file 'C:/mcu/reports/report__mbed_os5_release_non_regression_F756ZG_mbed-os-5.5.7__2017_09_28_00_06.html'...\r\nmbedgt: unexpected error:\r\n\t'unicodeescape' codec can't decode bytes in position 6308-6310: truncated \\uXXXX escape\r\nTraceback (most recent call last):\r\n File \"C:\\Python27\\Scripts\\mbedgt-script.py\", line 11, in \r\n load_entry_point('mbed-greentea==1.3.0', 'console_scripts', 'mbedgt')()\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_greentea_cli.py\", line 416, in main\r\n cli_ret = main_cli(opts, args)\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_greentea_cli.py\", line 1067, in main_cli\r\n html_report = exporter_html(test_report)\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_report_api.py\", line 747, in exporter_html\r\n test_results)\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_report_api.py\", line 636, in get_result_overlay\r\n overlay_dropdowns = get_result_overlay_dropdowns(result_div_id, test_results)\r\n File \"c:\\python27\\lib\\site-packages\\mbed_greentea\\mbed_report_api.py\", line 598, in get_result_overlay_dropdowns\r\n .decode(\"unicode-escape\")\r\nUnicodeDecodeError: 'unicodeescape' codec can't decode bytes in position 6308-6310: truncated \\uXXXX escape\r\n\r\n@theotherjimmy \r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"8f7b28f8ec739156d238304fa4f5f2e5156536f5"},"FAIL_TO_PASS":{"kind":"list like","value":["test/report_api.py::ReportEmitting::test_report_zero_testcases"],"string":"[\n \"test/report_api.py::ReportEmitting::test_report_zero_testcases\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["test/report_api.py::ReportEmitting::test_report_zero_tests"],"string":"[\n \"test/report_api.py::ReportEmitting::test_report_zero_tests\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [],\n \"has_test_patch\": true,\n \"is_lite\": true\n}"},"created_at":{"kind":"string","value":"2017-09-29 17:09:53+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":14,"string":"14"}}},{"rowIdx":15,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__greentea-250"},"patch":{"kind":"string","value":"diff --git a/mbed_greentea/mbed_target_info.py b/mbed_greentea/mbed_target_info.py\nindex 356676b..c825bcf 100644\n--- a/mbed_greentea/mbed_target_info.py\n+++ b/mbed_greentea/mbed_target_info.py\n@@ -20,6 +20,17 @@ Author: Przemyslaw Wirkus \n import os\n import re\n import json\n+from os import walk\n+try:\n+ from contextlib import suppress\n+except ImportError:\n+ from contextlib import contextmanager\n+ @contextmanager\n+ def suppress(*excs):\n+ try:\n+ yield\n+ except excs:\n+ pass\n from mbed_greentea.mbed_common_api import run_cli_process\n from mbed_greentea.mbed_greentea_log import gt_logger\n \n@@ -381,82 +392,65 @@ def get_platform_property(platform, property):\n :return: property value, None if property not found\n \"\"\"\n \n- # First load from targets.json if available\n- value_from_targets_json = get_platform_property_from_targets(platform, property)\n- if value_from_targets_json:\n- return value_from_targets_json\n-\n- # Check if info is available for a specific platform\n- if platform in TARGET_INFO_MAPPING:\n- if property in TARGET_INFO_MAPPING[platform]['properties']:\n- return TARGET_INFO_MAPPING[platform]['properties'][property]\n+ default = _get_platform_property_from_default(property)\n+ from_targets_json = _get_platform_property_from_targets(\n+ platform, property, default)\n+ if from_targets_json:\n+ return from_targets_json\n+ from_info_mapping = _get_platform_property_from_info_mapping(platform, property)\n+ if from_info_mapping:\n+ return from_info_mapping\n+ return default\n+\n+def _get_platform_property_from_default(property):\n+ with suppress(KeyError):\n+ return TARGET_INFO_MAPPING['default'][property]\n+\n+def _get_platform_property_from_info_mapping(platform, property):\n+ with suppress(KeyError):\n+ return TARGET_INFO_MAPPING[platform]['properties'][property]\n+\n+def _platform_property_from_targets_json(targets, platform, property, default):\n+ \"\"\"! Get a platforms's property from the target data structure in\n+ targets.json. Takes into account target inheritance.\n+ @param targets Data structure parsed from targets.json\n+ @param platform Name of the platform\n+ @param property Name of the property\n+ @param default the fallback value if none is found, but the target exists\n+ @return property value, None if property not found\n \n- # Check if default data is available\n- if 'default' in TARGET_INFO_MAPPING:\n- if property in TARGET_INFO_MAPPING['default']:\n- return TARGET_INFO_MAPPING['default'][property]\n-\n- return None\n+ \"\"\"\n+ with suppress(KeyError):\n+ return targets[platform][property]\n+ with suppress(KeyError):\n+ for inherited_target in targets[platform]['inherits']:\n+ result = _platform_property_from_targets_json(targets, inherited_target, property, None)\n+ if result:\n+ return result\n+ if platform in targets:\n+ return default\n+\n+IGNORED_DIRS = ['.build', 'BUILD', 'tools']\n+\n+def _find_targets_json(path):\n+ for root, dirs, files in walk(path, followlinks=True):\n+ for ignored_dir in IGNORED_DIRS:\n+ if ignored_dir in dirs:\n+ dirs.remove(ignored_dir)\n+ if 'targets.json' in files:\n+ yield os.path.join(root, 'targets.json')\n \n-def get_platform_property_from_targets(platform, property):\n+def _get_platform_property_from_targets(platform, property, default):\n \"\"\"\n Load properties from targets.json file somewhere in the project structure\n \n :param platform:\n :return: property value, None if property not found\n \"\"\"\n-\n- def get_platform_property_from_targets(targets, platform, property):\n- \"\"\"! Get a platforms's property from the target data structure in\n- targets.json. Takes into account target inheritance.\n- @param targets Data structure parsed from targets.json\n- @param platform Name of the platform\n- @param property Name of the property\n- @return property value, None if property not found\n-\n- \"\"\"\n-\n- result = None\n- if platform in targets:\n- if property in targets[platform]:\n- result = targets[platform][property]\n- elif 'inherits' in targets[platform]:\n- result = None\n- for inherited_target in targets[platform]['inherits']:\n- result = get_platform_property_from_targets(targets, inherited_target, property)\n-\n- # Stop searching after finding the first value for the property\n- if result:\n- break\n-\n- return result\n-\n- result = None\n- targets_json_path = []\n- for root, dirs, files in os.walk(os.getcwd(), followlinks=True):\n- ignored_dirs = ['.build', 'BUILD', 'tools']\n-\n- for ignored_dir in ignored_dirs:\n- if ignored_dir in dirs:\n- dirs.remove(ignored_dir)\n-\n- if 'targets.json' in files:\n- targets_json_path.append(os.path.join(root, 'targets.json'))\n-\n- if not targets_json_path:\n- gt_logger.gt_log_warn(\"No targets.json files found, using default target properties\")\n-\n- for targets_path in targets_json_path:\n- try:\n+ for targets_path in _find_targets_json(os.getcwd()):\n+ with suppress(IOError, ValueError):\n with open(targets_path, 'r') as f:\n targets = json.load(f)\n-\n- # Load property from targets.json\n- result = get_platform_property_from_targets(targets, platform, property)\n-\n- # If a valid property was found, stop looking\n+ result = _platform_property_from_targets_json(targets, platform, property, default)\n if result:\n- break\n- except Exception:\n- continue\n- return result\n+ return result\ndiff --git a/setup.py b/setup.py\nindex e98e109..0734dfe 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -50,13 +50,15 @@ setup(name='mbed-greentea',\n license=LICENSE,\n test_suite = 'test',\n entry_points={\n- \"console_scripts\": [\"mbedgt=mbed_greentea.mbed_greentea_cli:main\",],\n+ \"console_scripts\": [\"mbedgt=mbed_greentea.mbed_greentea_cli:main\",],\n },\n install_requires=[\"PrettyTable>=0.7.2\",\n- \"PySerial>=3.0\",\n- \"mbed-host-tests>=1.2.0\",\n- \"mbed-ls>=1.2.15\",\n- \"junit-xml\",\n- \"lockfile\",\n- \"mock\",\n- \"colorama>=0.3,<0.4\"])\n+ \"PySerial>=3.0\",\n+ \"mbed-host-tests>=1.2.0\",\n+ \"mbed-ls>=1.2.15\",\n+ \"junit-xml\",\n+ \"lockfile\",\n+ \"mock\",\n+ \"six\",\n+ \"colorama>=0.3,<0.4\"])\n+\n"},"repo":{"kind":"string","value":"ARMmbed/greentea"},"base_commit":{"kind":"string","value":"b8bcffbb7aaced094f252a4ddfe930e8237fb484"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/test/mbed_gt_target_info.py b/test/mbed_gt_target_info.py\nindex e3f0a6a..96cd1db 100644\n--- a/test/mbed_gt_target_info.py\n+++ b/test/mbed_gt_target_info.py\n@@ -21,6 +21,8 @@ import shutil\n import tempfile\n import unittest\n \n+from six import StringIO\n+\n from mock import patch\n from mbed_greentea import mbed_target_info\n \n@@ -338,8 +340,168 @@ mbed-gcc 1.1.0\n result = mbed_target_info.add_target_info_mapping(\"null\")\n \n \n- def test_get_platform_property_from_targets(self):\n- result = mbed_target_info.get_platform_property_from_targets({}, {})\n+ def test_get_platform_property_from_targets_no_json(self):\n+ with patch(\"mbed_greentea.mbed_target_info._find_targets_json\") as _find:\n+ _find.return_value = iter([])\n+ result = mbed_target_info._get_platform_property_from_targets(\"not_a_platform\", \"not_a_property\", \"default\")\n+ self.assertIsNone(result)\n+\n+ def test_get_platform_property_from_targets_no_file(self):\n+ with patch(\"mbed_greentea.mbed_target_info._find_targets_json\") as _find,\\\n+ patch(\"mbed_greentea.mbed_target_info.open\") as _open:\n+ _find.return_value = iter([\"foo\"])\n+ _open.side_effect = IOError\n+ result = mbed_target_info._get_platform_property_from_targets(\"not_a_platform\", \"not_a_property\", \"default\")\n+ self.assertIsNone(result)\n+\n+ def test_get_platform_property_from_targets_invalid_json(self):\n+ with patch(\"mbed_greentea.mbed_target_info._find_targets_json\") as _find,\\\n+ patch(\"mbed_greentea.mbed_target_info.open\") as _open:\n+ _find.return_value = iter([\"foo\"])\n+ _open.return_value.__enter__.return_value = StringIO(\"{\")\n+ result = mbed_target_info._get_platform_property_from_targets(\"not_a_platform\", \"not_a_property\", \"default\")\n+ self.assertIsNone(result)\n+\n+ def test_get_platform_property_from_targets_empty_json(self):\n+ with patch(\"mbed_greentea.mbed_target_info._find_targets_json\") as _find,\\\n+ patch(\"mbed_greentea.mbed_target_info.open\") as _open:\n+ _find.return_value = iter([\"foo\"])\n+ _open.return_value.__enter__.return_value = StringIO(\"{}\")\n+ result = mbed_target_info._get_platform_property_from_targets(\"not_a_platform\", \"not_a_property\", \"default\")\n+ self.assertIsNone(result)\n+\n+ def test_get_platform_property_from_targets_no_value(self):\n+ with patch(\"mbed_greentea.mbed_target_info._find_targets_json\") as _find,\\\n+ patch(\"mbed_greentea.mbed_target_info.open\") as _open:\n+ _find.return_value = iter([\"foo\"])\n+ _open.return_value.__enter__.return_value = StringIO(\"{\\\"K64F\\\": {}}\")\n+ result = mbed_target_info._get_platform_property_from_targets(\"K64F\", \"not_a_property\", \"default\")\n+ self.assertEqual(result, \"default\")\n+\n+ def test_get_platform_property_from_targets_in_json(self):\n+ with patch(\"mbed_greentea.mbed_target_info._find_targets_json\") as _find,\\\n+ patch(\"mbed_greentea.mbed_target_info.open\") as _open:\n+ _find.return_value = iter([\"foo\"])\n+ _open.return_value.__enter__.return_value = StringIO(\"{\\\"K64F\\\": {\\\"copy_method\\\": \\\"cp\\\"}}\")\n+ result = mbed_target_info._get_platform_property_from_targets(\"K64F\", \"copy_method\", \"default\")\n+ self.assertEqual(\"cp\", result)\n+\n+ def test_find_targets_json(self):\n+ with patch(\"mbed_greentea.mbed_target_info.walk\") as _walk:\n+ _walk.return_value = iter([(\"\", [\"foo\"], []), (\"foo\", [], [\"targets.json\"])])\n+ result = list(mbed_target_info._find_targets_json(\"bogus_path\"))\n+ self.assertEqual(result, [\"foo/targets.json\"])\n+\n+ def test_find_targets_json_ignored(self):\n+ with patch(\"mbed_greentea.mbed_target_info.walk\") as _walk:\n+ walk_result =[(\"\", [\".build\"], [])]\n+ _walk.return_value = iter(walk_result)\n+ result = list(mbed_target_info._find_targets_json(\"bogus_path\"))\n+ self.assertEqual(result, [])\n+ self.assertEqual(walk_result, [(\"\", [], [])])\n+\n+ def test_platform_property_from_targets_json_empty(self):\n+ result = mbed_target_info._platform_property_from_targets_json(\n+ {}, \"not_a_target\", \"not_a_property\", \"default\"\n+ )\n+ self.assertIsNone(result)\n+\n+ def test_platform_property_from_targets_json_base_target(self):\n+ result = mbed_target_info._platform_property_from_targets_json(\n+ {\"K64F\": {\"copy_method\": \"cp\"}}, \"K64F\", \"copy_method\", \"default\"\n+ )\n+ self.assertEqual(result, \"cp\")\n+\n+ def test_platform_property_from_targets_json_inherits(self):\n+ result = mbed_target_info._platform_property_from_targets_json(\n+ {\"K64F\": {\"inherits\": [\"Target\"]}, \"Target\": {\"copy_method\": \"cp\"}},\n+ \"K64F\", \"copy_method\", \"default\"\n+ )\n+ self.assertEqual(result, \"cp\")\n+\n+ def test_platform_property_from_default_missing(self):\n+ result = mbed_target_info._get_platform_property_from_default(\"not_a_property\")\n+ self.assertIsNone(result)\n+\n+ def test_platform_property_from_default(self):\n+ result = mbed_target_info._get_platform_property_from_default(\"copy_method\")\n+ self.assertEqual(result, \"default\")\n+\n+ def test_platform_property_from_info_mapping_bad_platform(self):\n+ result = mbed_target_info._get_platform_property_from_info_mapping(\"not_a_platform\", \"not_a_property\")\n+ self.assertIsNone(result)\n+\n+ def test_platform_property_from_info_mapping_missing(self):\n+ result = mbed_target_info._get_platform_property_from_info_mapping(\"K64F\", \"not_a_property\")\n+ self.assertIsNone(result)\n+\n+ def test_platform_property_from_info_mapping(self):\n+ result = mbed_target_info._get_platform_property_from_info_mapping(\"K64F\", \"copy_method\")\n+ self.assertEqual(result, \"default\")\n+\n+\n+ # The following test cases are taken from this table:\n+ #\n+ # Num | In targets.json | In yotta blob | In Default | property used\n+ # --- | --------------- | ------------- | ---------- | --------------\n+ # 1 | Yes | No | Yes |`targets.json`\n+ # 2 | Yes | Yes | Yes |`targets.json`\n+ # 3 | No | Yes | Yes | yotta blob\n+ # 4 | No | No | Yes | default\n+ # 5 | No | No | No | None\n+ # 6 | Yes | No | No |`targets.json`\n+ # 7 | Yes | Yes | No |`targets.json`\n+ # 8 | No | Yes | No | yotta blob\n+ def test_platform_property(self):\n+ \"\"\"Test that platform_property picks the property value preserving\n+ the following priority relationship:\n+ targets.json > yotta blob > default\n+ \"\"\"\n+ with patch(\"mbed_greentea.mbed_target_info._get_platform_property_from_targets\") as _targets,\\\n+ patch(\"mbed_greentea.mbed_target_info._get_platform_property_from_info_mapping\") as _info_mapping,\\\n+ patch(\"mbed_greentea.mbed_target_info._get_platform_property_from_default\") as _default:\n+ # 1\n+ _targets.return_value = \"targets\"\n+ _info_mapping.return_value = None\n+ _default.return_value = \"default\"\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"targets\")\n+ # 2\n+ _info_mapping.return_value = \"yotta\"\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"targets\")\n+ # 3\n+ _targets.return_value = None\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"yotta\")\n+ # 4\n+ _info_mapping.return_value = None\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"default\")\n+ # 5\n+ _default.return_value = None\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ None)\n+ # 6\n+ _targets.return_value = \"targets\"\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"targets\")\n+ # 7\n+ _info_mapping.return_value = \"yotta\"\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"targets\")\n+ # 8\n+ _targets.return_value = None\n+ self.assertEqual(\n+ mbed_target_info.get_platform_property(\"K64F\", \"copy_method\"),\n+ \"yotta\")\n \n \n def test_parse_yotta_json_for_build_name(self):\n"},"problem_statement":{"kind":"string","value":"Target property priority incorrect\nCurrently we have priority as follows:\r\n```\r\ninternal yotta blob > targets.json > tool default\r\n```\r\nThis is a bug.\r\n\r\nInstead the priority should be:\r\n```\r\ntargets.json /w default > internal yotta blob > tool delaut\r\n```\r\n\r\nThis implies a few test cases:\r\n\r\nIn targets.json | In yotta blob | property used | Currently Works\r\n---------------------- | ------------- | ---------------- | ---------------\r\nYes, with property | No | `targets.json` | Yes\r\nYes, without property| No | default | Yes\r\nYes, with property | Yes | `targets.json` | No\r\nYes, without property | Yes | default | No\r\nNo | No | default | Yes\r\nNo | Yes | yotta blob | Yes\r\n\r\n@bridadan Is this the issue masked by #248?\r\n\r\n\r\n\r\n\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"b8bcffbb7aaced094f252a4ddfe930e8237fb484"},"FAIL_TO_PASS":{"kind":"list like","value":["test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_inherits","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_invalid_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_in_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_base_target","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_bad_platform","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_file","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default_missing","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_missing","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json_ignored","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_empty_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_value","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_empty","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default"],"string":"[\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_inherits\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_invalid_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_in_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_base_target\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_bad_platform\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_file\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default_missing\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_missing\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json_ignored\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_empty_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_value\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_empty\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_keywords","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_path","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_failed_open","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_valid_path","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_invalid_path","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_add_target_info_mapping","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_json_for_build_name","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_multiple","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl_whitechars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_target","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_target_from_current_dir_ok","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_json_data","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_whitechars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text_2","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_chars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl_whitechars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_version","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_name","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_valid","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_target","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_with_ssl_errors","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_fail","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_text"],"string":"[\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_keywords\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_path\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_failed_open\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_valid_path\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_invalid_path\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_add_target_info_mapping\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_json_for_build_name\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_multiple\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl_whitechars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_target\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_target_from_current_dir_ok\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_json_data\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_whitechars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text_2\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_chars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl_whitechars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_version\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_name\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_valid\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_target\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_with_ssl_errors\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_fail\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_text\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_many_modified_files\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2017-10-20 19:13:58+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":15,"string":"15"}}},{"rowIdx":16,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__greentea-263"},"patch":{"kind":"string","value":"diff --git a/mbed_greentea/mbed_greentea_cli.py b/mbed_greentea/mbed_greentea_cli.py\nindex f6a13c4..446b965 100644\n--- a/mbed_greentea/mbed_greentea_cli.py\n+++ b/mbed_greentea/mbed_greentea_cli.py\n@@ -23,6 +23,7 @@ import os\n import sys\n import random\n import optparse\n+import fnmatch\n from time import time\n try:\n from Queue import Queue\n@@ -119,18 +120,6 @@ def create_filtered_test_list(ctest_test_list, test_by_names, skip_test, test_sp\n @return\n \"\"\"\n \n- def filter_names_by_prefix(test_case_name_list, prefix_name):\n- \"\"\"!\n- @param test_case_name_list List of all test cases\n- @param prefix_name Prefix of test name we are looking for\n- @result Set with names of test names starting with 'prefix_name'\n- \"\"\"\n- result = list()\n- for test_name in test_case_name_list:\n- if test_name.startswith(prefix_name):\n- result.append(test_name)\n- return sorted(result)\n-\n filtered_ctest_test_list = ctest_test_list\n test_list = None\n invalid_test_names = []\n@@ -143,17 +132,15 @@ def create_filtered_test_list(ctest_test_list, test_by_names, skip_test, test_sp\n gt_logger.gt_log(\"test case filter (specified with -n option)\")\n \n for test_name in set(test_list):\n- if test_name.endswith('*'):\n- # This 'star-sufix' filter allows users to filter tests with fixed prefixes\n- # Example: -n 'TESTS-mbed_drivers* will filter all test cases with name starting with 'TESTS-mbed_drivers'\n- for test_name_filtered in filter_names_by_prefix(ctest_test_list.keys(), test_name[:-1]):\n- gt_logger.gt_log_tab(\"test filtered in '%s'\"% gt_logger.gt_bright(test_name_filtered))\n- filtered_ctest_test_list[test_name_filtered] = ctest_test_list[test_name_filtered]\n- elif test_name not in ctest_test_list:\n- invalid_test_names.append(test_name)\n+ gt_logger.gt_log_tab(test_name)\n+ matches = [test for test in ctest_test_list.keys() if fnmatch.fnmatch(test, test_name)]\n+ gt_logger.gt_log_tab(str(ctest_test_list))\n+ if matches:\n+ for match in matches:\n+ gt_logger.gt_log_tab(\"test filtered in '%s'\"% gt_logger.gt_bright(match))\n+ filtered_ctest_test_list[match] = ctest_test_list[match]\n else:\n- gt_logger.gt_log_tab(\"test filtered in '%s'\"% gt_logger.gt_bright(test_name))\n- filtered_ctest_test_list[test_name] = ctest_test_list[test_name]\n+ invalid_test_names.append(test_name)\n \n if skip_test:\n test_list = skip_test.split(',')\n"},"repo":{"kind":"string","value":"ARMmbed/greentea"},"base_commit":{"kind":"string","value":"68508c5f4d7cf0635c75399d0ff7cfa896fdf2cc"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/test/mbed_gt_cli.py b/test/mbed_gt_cli.py\nindex 0646c20..8f4a1eb 100644\n--- a/test/mbed_gt_cli.py\n+++ b/test/mbed_gt_cli.py\n@@ -21,6 +21,36 @@ import sys\n import unittest\n \n from mbed_greentea import mbed_greentea_cli\n+from mbed_greentea.tests_spec import TestSpec\n+\n+test_spec_def = {\n+ \"builds\": {\n+ \"K64F-ARM\": {\n+ \"platform\": \"K64F\",\n+ \"toolchain\": \"ARM\",\n+ \"base_path\": \"./.build/K64F/ARM\",\n+ \"baud_rate\": 115200,\n+ \"tests\": {\n+ \"mbed-drivers-test-generic_tests\":{\n+ \"binaries\":[\n+ {\n+ \"binary_type\": \"bootable\",\n+ \"path\": \"./.build/K64F/ARM/mbed-drivers-test-generic_tests.bin\"\n+ }\n+ ]\n+ },\n+ \"mbed-drivers-test-c_strings\":{\n+ \"binaries\":[\n+ {\n+ \"binary_type\": \"bootable\",\n+ \"path\": \"./.build/K64F/ARM/mbed-drivers-test-c_strings.bin\"\n+ }\n+ ]\n+ }\n+ }\n+ }\n+ }\n+}\n \n class GreenteaCliFunctionality(unittest.TestCase):\n \n@@ -86,5 +116,36 @@ class GreenteaCliFunctionality(unittest.TestCase):\n os.chdir(curr_dir)\n shutil.rmtree(test1_dir)\n \n+ def test_create_filtered_test_list(self):\n+ test_spec = TestSpec()\n+ test_spec.parse(test_spec_def)\n+ test_build = test_spec.get_test_builds()[0]\n+\n+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),\n+ 'mbed-drivers-test-generic_*',\n+ None,\n+ test_spec=test_spec)\n+ self.assertEqual(set(test_list.keys()), set(['mbed-drivers-test-generic_tests']))\n+\n+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),\n+ '*_strings',\n+ None,\n+ test_spec=test_spec)\n+ self.assertEqual(set(test_list.keys()), set(['mbed-drivers-test-c_strings']))\n+\n+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),\n+ 'mbed*s',\n+ None,\n+ test_spec=test_spec)\n+ expected = set(['mbed-drivers-test-c_strings', 'mbed-drivers-test-generic_tests'])\n+ self.assertEqual(set(test_list.keys()), expected)\n+\n+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),\n+ '*-drivers-*',\n+ None,\n+ test_spec=test_spec)\n+ expected = set(['mbed-drivers-test-c_strings', 'mbed-drivers-test-generic_tests'])\n+ self.assertEqual(set(test_list.keys()), expected)\n+\n if __name__ == '__main__':\n unittest.main()\ndiff --git a/test/mbed_gt_target_info.py b/test/mbed_gt_target_info.py\nindex e630e7b..a12ba09 100644\n--- a/test/mbed_gt_target_info.py\n+++ b/test/mbed_gt_target_info.py\n@@ -416,7 +416,7 @@ mbed-gcc 1.1.0\n with patch(\"mbed_greentea.mbed_target_info.walk\") as _walk:\n _walk.return_value = iter([(\"\", [\"foo\"], []), (\"foo\", [], [\"targets.json\"])])\n result = list(mbed_target_info._find_targets_json(\"bogus_path\"))\n- self.assertEqual(result, [\"foo/targets.json\"])\n+ self.assertEqual(result, [os.path.join(\"foo\", \"targets.json\")])\n \n def test_find_targets_json_ignored(self):\n with patch(\"mbed_greentea.mbed_target_info.walk\") as _walk:\n"},"problem_statement":{"kind":"string","value":"Test names are not correctly globbed\nTest names only respect a wildcard that is placed at the end of the string. Ex. \"mbed-os-*\".\r\n\r\nHowever, it does not respect the wildcard anywhere else. Ex. \"*-timer\"\r\n\r\nThe build tools accept these wildcards, so greentea should as well. This is the line responsible: https://github.com/ARMmbed/greentea/blob/32b95b44be653c3db527c02e1c5e1ffdc7d37f6f/mbed_greentea/mbed_greentea_cli.py#L146\r\n\r\nShould be switched to `fnmatch`.\r\n\r\n(This is mostly a note to myself to fix it)"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"68508c5f4d7cf0635c75399d0ff7cfa896fdf2cc"},"FAIL_TO_PASS":{"kind":"list like","value":["test/mbed_gt_cli.py::GreenteaCliFunctionality::test_create_filtered_test_list"],"string":"[\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_create_filtered_test_list\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_invalid_path","test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_hello_string","test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_default_path","test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_valid_path","test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_greentea_version","test/mbed_gt_cli.py::GreenteaCliFunctionality::test_print_version","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json_ignored","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_path","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_value","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_add_target_info_mapping","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_chars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_json_for_build_name","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_fail","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_target","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl_whitechars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_multiple","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_whitechars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_text","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_version","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_valid","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_keywords","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_with_ssl_errors","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_no_name","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_invalid_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_inherits","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_invalid_path","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_failed_open","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default_missing","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl_whitechars","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_name","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_target","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_valid_path","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_json_data","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_empty","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_bad_platform","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_missing","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text_2","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_no_keywords","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_file","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_empty_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_in_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_target_from_current_dir_ok","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output","test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_base_target"],"string":"[\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_invalid_path\",\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_hello_string\",\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_default_path\",\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_valid_path\",\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_greentea_version\",\n \"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_print_version\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json_ignored\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_path\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_value\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_add_target_info_mapping\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_chars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_json_for_build_name\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_fail\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_target\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl_whitechars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_multiple\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_whitechars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_text\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_version\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_valid\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_keywords\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_with_ssl_errors\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_no_name\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_invalid_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_inherits\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_invalid_path\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_failed_open\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default_missing\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl_whitechars\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_name\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_target\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_valid_path\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_json_data\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_empty\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_bad_platform\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_missing\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text_2\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_no_keywords\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_file\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_empty_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_in_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_target_from_current_dir_ok\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output\",\n \"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_base_target\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [],\n \"has_test_patch\": true,\n \"is_lite\": true\n}"},"created_at":{"kind":"string","value":"2018-02-15 17:29:56+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":16,"string":"16"}}},{"rowIdx":17,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__mbed-tools-138"},"patch":{"kind":"string","value":"diff --git a/news/20201201142709.bugfix b/news/20201201142709.bugfix\nnew file mode 100644\nindex 0000000..0468f3e\n--- /dev/null\n+++ b/news/20201201142709.bugfix\n@@ -0,0 +1,1 @@\n+Fix bug where we failed to handle config options that contain quotes (#125)\ndiff --git a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl\nindex e4820af..08ccced 100644\n--- a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl\n+++ b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl\n@@ -65,7 +65,7 @@ set(MBED_CONFIG_DEFINITIONS\n # options\n {% for option in options -%}\n {% if option.value is not none -%}\n- {%if '{' in option.value|string or '(' in option.value|string %}\"{% endif %}-D{{option.macro_name}}={{option.value}}{% if '}' in option.value|string or ')' in option.value|string %}\"{% endif %}\n+ \"-D{{option.macro_name}}={{option.value|replace(\"\\\"\", \"\\\\\\\"\")}}\"\n {% endif %}\n {%- endfor %}\n # macros\n"},"repo":{"kind":"string","value":"ARMmbed/mbed-tools"},"base_commit":{"kind":"string","value":"94a3bd761d6ab3305c81da93517767aafff58d7e"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/build/_internal/test_cmake_file.py b/tests/build/_internal/test_cmake_file.py\nindex 1f59cb3..b0247a8 100644\n--- a/tests/build/_internal/test_cmake_file.py\n+++ b/tests/build/_internal/test_cmake_file.py\n@@ -2,67 +2,69 @@\n # Copyright (C) 2020 Arm Mbed. All rights reserved.\n # SPDX-License-Identifier: Apache-2.0\n #\n-from unittest import TestCase\n+import pytest\n \n-from tests.build._internal.config.factories import ConfigFactory\n+from tests.build._internal.config.factories import ConfigFactory, SourceFactory\n from mbed_tools.build._internal.cmake_file import generate_mbed_config_cmake_file, _render_mbed_config_cmake_template\n+from mbed_tools.build._internal.config.config import _create_config_option\n \n \n-class TestGenerateCMakeListsFile(TestCase):\n- def test_correct_arguments_passed(self):\n- target = dict()\n- target[\"labels\"] = [\"foo\"]\n- target[\"extra_labels\"] = [\"morefoo\"]\n- target[\"features\"] = [\"bar\"]\n- target[\"components\"] = [\"baz\"]\n- target[\"macros\"] = [\"macbaz\"]\n- target[\"device_has\"] = [\"stuff\"]\n- target[\"c_lib\"] = [\"c_lib\"]\n- target[\"core\"] = [\"core\"]\n- target[\"printf_lib\"] = [\"printf_lib\"]\n- target[\"supported_form_factors\"] = [\"arduino\"]\n+TOOLCHAIN_NAME = \"gcc\"\n+\n+\n+@pytest.fixture()\n+def fake_target():\n+ return {\n+ \"labels\": [\"foo\"],\n+ \"extra_labels\": [\"morefoo\"],\n+ \"features\": [\"bar\"],\n+ \"components\": [\"baz\"],\n+ \"macros\": [\"macbaz\"],\n+ \"device_has\": [\"stuff\"],\n+ \"c_lib\": [\"c_lib\"],\n+ \"core\": [\"core\"],\n+ \"printf_lib\": [\"printf_lib\"],\n+ \"supported_form_factors\": [\"arduino\"],\n+ \"supported_c_libs\": {TOOLCHAIN_NAME: [\"ginormous\"]},\n+ \"supported_application_profiles\": [\"full\", \"bare-metal\"],\n+ }\n+\n+\n+class TestGenerateCMakeListsFile:\n+ def test_correct_arguments_passed(self, fake_target):\n config = ConfigFactory()\n mbed_target = \"K64F\"\n- toolchain_name = \"GCC\"\n- target[\"supported_c_libs\"] = {toolchain_name.lower(): [\"small\", \"std\"]}\n- target[\"supported_application_profiles\"] = [\"full\", \"bare-metal\"]\n-\n- result = generate_mbed_config_cmake_file(mbed_target, target, config, toolchain_name)\n-\n- self.assertEqual(\n- result, _render_mbed_config_cmake_template(target, config, toolchain_name, mbed_target,),\n- )\n-\n-\n-class TestRendersCMakeListsFile(TestCase):\n- def test_returns_rendered_content(self):\n- target = dict()\n- target[\"labels\"] = [\"foo\"]\n- target[\"extra_labels\"] = [\"morefoo\"]\n- target[\"features\"] = [\"bar\"]\n- target[\"components\"] = [\"baz\"]\n- target[\"macros\"] = [\"macbaz\"]\n- target[\"device_has\"] = [\"stuff\"]\n- target[\"core\"] = [\"core\"]\n- target[\"c_lib\"] = [\"c_lib\"]\n- target[\"printf_lib\"] = [\"printf_lib\"]\n- target[\"supported_form_factors\"] = [\"arduino\"]\n+\n+ result = generate_mbed_config_cmake_file(mbed_target, fake_target, config, TOOLCHAIN_NAME)\n+\n+ assert result == _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, mbed_target,)\n+\n+\n+class TestRendersCMakeListsFile:\n+ def test_returns_rendered_content(self, fake_target):\n config = ConfigFactory()\n- toolchain_name = \"baz\"\n- target[\"supported_c_libs\"] = {toolchain_name.lower(): [\"small\", \"std\"]}\n- target[\"supported_application_profiles\"] = [\"full\", \"bare-metal\"]\n- result = _render_mbed_config_cmake_template(target, config, toolchain_name, \"target_name\")\n+ result = _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, \"target_name\")\n \n- for label in target[\"labels\"] + target[\"extra_labels\"]:\n- self.assertIn(label, result)\n+ for label in fake_target[\"labels\"] + fake_target[\"extra_labels\"]:\n+ assert label in result\n \n- for macro in target[\"features\"] + target[\"components\"] + [toolchain_name]:\n- self.assertIn(macro, result)\n+ for macro in fake_target[\"features\"] + fake_target[\"components\"] + [TOOLCHAIN_NAME]:\n+ assert macro in result\n \n- for toolchain in target[\"supported_c_libs\"]:\n- self.assertIn(toolchain, result)\n+ for toolchain in fake_target[\"supported_c_libs\"]:\n+ assert toolchain in result\n for supported_c_libs in toolchain:\n- self.assertIn(supported_c_libs, result)\n+ assert supported_c_libs in result\n+\n+ for supported_application_profiles in fake_target[\"supported_application_profiles\"]:\n+ assert supported_application_profiles in result\n+\n+ def test_returns_quoted_content(self, fake_target):\n+ config = ConfigFactory()\n+ source = SourceFactory()\n+\n+ # Add an option whose value contains quotes to the config.\n+ _create_config_option(config, \"iotc-mqtt-host\", '{\"mqtt.2030.ltsapis.goog\", IOTC_MQTT_PORT}', source)\n \n- for supported_application_profiles in target[\"supported_application_profiles\"]:\n- self.assertIn(supported_application_profiles, result)\n+ result = _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, \"target_name\")\n+ assert '\"-DMBED_CONF_IOTC_MQTT_HOST={\\\\\"mqtt.2030.ltsapis.goog\\\\\", IOTC_MQTT_PORT}\"' in result\n"},"problem_statement":{"kind":"string","value":"mbed-tools fails to handle config options that contain quotes\n### Description\r\n\r\nFrom @rajkan01:\r\n\r\nFor the below mbed_lib.json config\r\n\r\n```\r\n\"iotc-mqtt-host\": { \t \r\n \"help\": \"IOTC MQTT host configuration. Defaults to mqtt.2030.ltsapis.goog host and port number 8883 if undefined\", \t \r\n \"value\": \"{\\\"mqtt.2030.ltsapis.goog\\\", IOTC_MQTT_PORT}\", \t \r\n \"macro_name\": \"IOTC_MQTT_HOST\" \t \r\n }\r\n```\r\n\r\nMbedtools is generating `\"-DIOTC_MQTT_HOST={\"mqtt.2030.ltsapis.goog\", IOTC_MQTT_PORT}\"` config starts double-quotes from -D itself, and CMake prepossessing time this macro gets divided into multiple #define like below because of this define begin with double-quotes and also the value (\"mqtt.2030.ltsapis.goog\") with double-quote consider to be a string\r\n\r\n```\r\n#define IOTC_MQTT_HOST { \r\n#define mqtt .2030.ltsapis.goog, IOTC_MQTT_PORT} 1 \r\n```\r\n\r\nCould someone check this, why is the mbedtools generating macros starts with double-quotes which include `-D` and fix.\r\n\r\nI've attached `main.ii` and `mbed_config.cmake`\r\n[mbed_config.zip](https://github.com/ARMmbed/mbed-tools/files/5602300/mbed_config.zip)\r\n\r\n\r\n### Issue request type\r\n\r\n\r\n\r\n- [ ] Enhancement\r\n- [X] Bug\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"94a3bd761d6ab3305c81da93517767aafff58d7e"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/build/_internal/test_cmake_file.py::TestRendersCMakeListsFile::test_returns_quoted_content"],"string":"[\n \"tests/build/_internal/test_cmake_file.py::TestRendersCMakeListsFile::test_returns_quoted_content\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/build/_internal/test_cmake_file.py::TestGenerateCMakeListsFile::test_correct_arguments_passed","tests/build/_internal/test_cmake_file.py::TestRendersCMakeListsFile::test_returns_rendered_content"],"string":"[\n \"tests/build/_internal/test_cmake_file.py::TestGenerateCMakeListsFile::test_correct_arguments_passed\",\n \"tests/build/_internal/test_cmake_file.py::TestRendersCMakeListsFile::test_returns_rendered_content\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_hyperlinks\",\n \"has_added_files\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2020-12-01 14:33:04+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":17,"string":"17"}}},{"rowIdx":18,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__mbed-tools-154"},"patch":{"kind":"string","value":"diff --git a/README.md b/README.md\nindex fdd2e05..eff3449 100644\n--- a/README.md\n+++ b/README.md\n@@ -48,6 +48,10 @@ follows:\n \n ## Installation\n \n+`mbed-tools` relies on the Ninja build system and CMake.\n+- CMake. [Install version 3.19.0 or newer for all operating systems](https://cmake.org/install/).\n+- Ninja. [Install version 1.0 or newer for all operating systems](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages).\n+\n We recommend installing `mbed-tools` in a Python virtual environment to avoid dependency conflicts.\n \n To install the most recent production quality release use:\ndiff --git a/news/20201210131204.bugfix b/news/20201210131204.bugfix\nnew file mode 100644\nindex 0000000..65ae014\n--- /dev/null\n+++ b/news/20201210131204.bugfix\n@@ -0,0 +1,1 @@\n+Emit more useful error messages if CMake or Ninja aren't found in PATH.\ndiff --git a/src/mbed_tools/build/build.py b/src/mbed_tools/build/build.py\nindex 66822bc..2334bc4 100644\n--- a/src/mbed_tools/build/build.py\n+++ b/src/mbed_tools/build/build.py\n@@ -22,6 +22,7 @@ def build_project(build_dir: pathlib.Path, target: Optional[str] = None) -> None\n build_dir: Path to the CMake build tree.\n target: The CMake target to build (e.g 'install')\n \"\"\"\n+ _check_ninja_found()\n target_flag = [\"--target\", target] if target is not None else []\n _cmake_wrapper(\"--build\", str(build_dir), *target_flag)\n \n@@ -34,6 +35,7 @@ def generate_build_system(source_dir: pathlib.Path, build_dir: pathlib.Path, pro\n build_dir: Path to the CMake build tree.\n profile: The Mbed build profile (develop, debug or release).\n \"\"\"\n+ _check_ninja_found()\n _cmake_wrapper(\"-S\", str(source_dir), \"-B\", str(build_dir), \"-GNinja\", f\"-DCMAKE_BUILD_TYPE={profile}\")\n \n \n@@ -41,5 +43,16 @@ def _cmake_wrapper(*cmake_args: str) -> None:\n try:\n logger.debug(\"Running CMake with args: %s\", cmake_args)\n subprocess.run([\"cmake\", *cmake_args], check=True)\n+ except FileNotFoundError:\n+ raise MbedBuildError(\"Could not find CMake. Please ensure CMake is installed and added to PATH.\")\n except subprocess.CalledProcessError:\n raise MbedBuildError(\"CMake invocation failed!\")\n+\n+\n+def _check_ninja_found() -> None:\n+ try:\n+ subprocess.run([\"ninja\", \"--version\"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n+ except FileNotFoundError:\n+ raise MbedBuildError(\n+ \"Could not find the 'Ninja' build program. Please ensure 'Ninja' is installed and added to PATH.\"\n+ )\n"},"repo":{"kind":"string","value":"ARMmbed/mbed-tools"},"base_commit":{"kind":"string","value":"9d6b2c71a7ddc93bd71279482a7572cac30ed745"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/build/test_build.py b/tests/build/test_build.py\nindex b9d32af..5293966 100644\n--- a/tests/build/test_build.py\n+++ b/tests/build/test_build.py\n@@ -2,45 +2,60 @@\n # Copyright (C) 2020 Arm Mbed. All rights reserved.\n # SPDX-License-Identifier: Apache-2.0\n #\n-import pathlib\n+import subprocess\n \n-from tempfile import TemporaryDirectory\n-from unittest import TestCase, mock\n+from unittest import mock\n+\n+import pytest\n \n from mbed_tools.build.build import build_project, generate_build_system\n from mbed_tools.build.exceptions import MbedBuildError\n \n \n-class TestBuildProject(TestCase):\n- @mock.patch(\"mbed_tools.build.build._cmake_wrapper\")\n- def test_invokes_cmake_with_correct_args(self, cmake_wrapper):\n+@pytest.fixture\n+def subprocess_run():\n+ with mock.patch(\"mbed_tools.build.build.subprocess.run\", autospec=True) as subproc:\n+ yield subproc\n+\n+\n+class TestBuildProject:\n+ def test_invokes_cmake_with_correct_args(self, subprocess_run):\n build_project(build_dir=\"cmake_build\", target=\"install\")\n \n- cmake_wrapper.assert_called_once_with(\"--build\", \"cmake_build\", \"--target\", \"install\")\n+ subprocess_run.assert_called_with([\"cmake\", \"--build\", \"cmake_build\", \"--target\", \"install\"], check=True)\n \n- @mock.patch(\"mbed_tools.build.build._cmake_wrapper\")\n- def test_invokes_cmake_with_correct_args_if_no_target_passed(self, cmake_wrapper):\n+ def test_invokes_cmake_with_correct_args_if_no_target_passed(self, subprocess_run):\n build_project(build_dir=\"cmake_build\")\n \n- cmake_wrapper.assert_called_once_with(\"--build\", \"cmake_build\")\n+ subprocess_run.assert_called_with([\"cmake\", \"--build\", \"cmake_build\"], check=True)\n \n- def test_raises_build_error_if_build_dir_doesnt_exist(self):\n- with TemporaryDirectory() as tmp_dir:\n- nonexistent_build_dir = pathlib.Path(tmp_dir, \"cmake_build\")\n+ def test_raises_build_error_if_cmake_invocation_fails(self, subprocess_run):\n+ subprocess_run.side_effect = (None, subprocess.CalledProcessError(1, \"\"))\n \n- with self.assertRaises(MbedBuildError):\n- build_project(nonexistent_build_dir)\n+ with pytest.raises(MbedBuildError, match=\"CMake invocation failed\"):\n+ build_project(build_dir=\"cmake_build\")\n \n \n-@mock.patch(\"mbed_tools.build.build._cmake_wrapper\")\n-class TestConfigureProject(TestCase):\n- def test_invokes_cmake_with_correct_args(self, cmake_wrapper):\n+class TestConfigureProject:\n+ def test_invokes_cmake_with_correct_args(self, subprocess_run):\n source_dir = \"source_dir\"\n build_dir = \"cmake_build\"\n profile = \"debug\"\n \n generate_build_system(source_dir, build_dir, profile)\n \n- cmake_wrapper.assert_called_once_with(\n- \"-S\", source_dir, \"-B\", build_dir, \"-GNinja\", f\"-DCMAKE_BUILD_TYPE={profile}\"\n+ subprocess_run.assert_called_with(\n+ [\"cmake\", \"-S\", source_dir, \"-B\", build_dir, \"-GNinja\", f\"-DCMAKE_BUILD_TYPE={profile}\"], check=True\n )\n+\n+ def test_raises_when_ninja_cannot_be_found(self, subprocess_run):\n+ subprocess_run.side_effect = FileNotFoundError\n+\n+ with pytest.raises(MbedBuildError, match=\"Ninja\"):\n+ generate_build_system(\"\", \"\", \"\")\n+\n+ def test_raises_when_cmake_cannot_be_found(self, subprocess_run):\n+ subprocess_run.side_effect = (None, FileNotFoundError)\n+\n+ with pytest.raises(MbedBuildError, match=\"Could not find CMake\"):\n+ generate_build_system(\"\", \"\", \"\")\n"},"problem_statement":{"kind":"string","value":"README.md : miss cmake and ninja information\n### Description\r\n\r\nHi\r\nThis morning, I spent some time on a new PC to install this new mbed tool,\r\nThis was not working, and I got several not friendly messages...\r\n... till I remembered that I didn't install cmake yet...\r\n\r\nSo my request would be:\r\n- to update tools when cmake is not installed with some friendly message \"please install cmake\"\r\n- same for ninja\r\n- to update README.md to add information how to install cmake and ninja\r\n\r\nThx\r\n\r\n@0xc0170 \r\n@MarceloSalazar \r\n@JeanMarcR\r\n\r\n\r\n\r\n\r\n\r\n### Issue request type\r\n\r\n\r\n\r\n- [x] Enhancement\r\n- [ ] Bug\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"9d6b2c71a7ddc93bd71279482a7572cac30ed745"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/build/test_build.py::TestBuildProject::test_raises_build_error_if_cmake_invocation_fails","tests/build/test_build.py::TestConfigureProject::test_raises_when_ninja_cannot_be_found","tests/build/test_build.py::TestConfigureProject::test_raises_when_cmake_cannot_be_found"],"string":"[\n \"tests/build/test_build.py::TestBuildProject::test_raises_build_error_if_cmake_invocation_fails\",\n \"tests/build/test_build.py::TestConfigureProject::test_raises_when_ninja_cannot_be_found\",\n \"tests/build/test_build.py::TestConfigureProject::test_raises_when_cmake_cannot_be_found\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/build/test_build.py::TestBuildProject::test_invokes_cmake_with_correct_args","tests/build/test_build.py::TestBuildProject::test_invokes_cmake_with_correct_args_if_no_target_passed","tests/build/test_build.py::TestConfigureProject::test_invokes_cmake_with_correct_args"],"string":"[\n \"tests/build/test_build.py::TestBuildProject::test_invokes_cmake_with_correct_args\",\n \"tests/build/test_build.py::TestBuildProject::test_invokes_cmake_with_correct_args_if_no_target_passed\",\n \"tests/build/test_build.py::TestConfigureProject::test_invokes_cmake_with_correct_args\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_hyperlinks\",\n \"has_added_files\",\n \"has_many_modified_files\",\n \"has_many_hunks\",\n \"has_pytest_match_arg\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2020-12-10 13:15:11+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":18,"string":"18"}}},{"rowIdx":19,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__mbed-tools-190"},"patch":{"kind":"string","value":"diff --git a/news/169.bugfix b/news/169.bugfix\nnew file mode 100644\nindex 0000000..78b6135\n--- /dev/null\n+++ b/news/169.bugfix\n@@ -0,0 +1,1 @@\n+Support use of user@host:directory syntax with the import subcommand.\ndiff --git a/src/mbed_tools/project/mbed_program.py b/src/mbed_tools/project/mbed_program.py\nindex d095e5b..c3a9536 100644\n--- a/src/mbed_tools/project/mbed_program.py\n+++ b/src/mbed_tools/project/mbed_program.py\n@@ -113,6 +113,9 @@ def parse_url(name_or_url: str) -> Dict[str, str]:\n url_obj = urlparse(name_or_url)\n if url_obj.hostname:\n url = url_obj.geturl()\n+ elif \":\" in name_or_url.split(\"/\", maxsplit=1)[0]:\n+ # If non-standard and no slashes before first colon, git will recognize as scp ssh syntax\n+ url = name_or_url\n else:\n url = f\"https://github.com/armmbed/{url_obj.path}\"\n # We need to create a valid directory name from the url path section.\n"},"repo":{"kind":"string","value":"ARMmbed/mbed-tools"},"base_commit":{"kind":"string","value":"d4dd48ce58952851f9cb2a9e98b0f788a61a23a3"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/project/test_mbed_program.py b/tests/project/test_mbed_program.py\nindex 7f700f0..be83aa9 100644\n--- a/tests/project/test_mbed_program.py\n+++ b/tests/project/test_mbed_program.py\n@@ -127,6 +127,12 @@ class TestParseURL(TestCase):\n self.assertEqual(data[\"url\"], url)\n self.assertEqual(data[\"dst_path\"], \"mbed-os-example-numskull\")\n \n+ def test_creates_valid_dst_dir_from_ssh_url(self):\n+ url = \"git@superversioncontrol:superorg/mbed-os-example-numskull\"\n+ data = parse_url(url)\n+ self.assertEqual(data[\"url\"], url)\n+ self.assertEqual(data[\"dst_path\"], \"mbed-os-example-numskull\")\n+\n \n class TestFindProgramRoot(TestCase):\n @patchfs\n"},"problem_statement":{"kind":"string","value":"mbed-tools import fails to import an example with ssh url\n### Description\r\n\r\n\r\n\r\nmbed-tools version: **5.0.0**\r\n\r\nCommand:\r\n\r\n`mbed-tools -vv import git@github.com:ARMmbed/mbed-os-example-blinky.git`\r\n\r\nExpected:\r\n\r\nmbed-os-example-blinky example cloned onto a local machine.\r\n\r\n \r\n\r\nOutput:\r\n\r\n```\r\n\r\nCloning Mbed program 'git@github.com:ARMmbed/mbed-os-example-blinky.git'\r\nResolving program library dependencies.\r\nERROR: Cloning git repository from url 'https://github.com/armmbed/git@github.com:ARMmbed/mbed-os-example-blinky.git' failed. Error from VCS: Cmd('git') failed due to: exit code(128)\r\ncmdline: git clone --progress -v https://github.com/armmbed/git@github.com:ARMmbed/mbed-os-example-blinky.git mbed-os-example-blinky.git\r\n\r\nMore information may be available by using the command line option '-vvv'.\r\n\r\n```\r\n\r\n\r\n### Issue request type\r\n\r\n\r\n\r\n- [ ] Enhancement\r\n- [x] Bug\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"d4dd48ce58952851f9cb2a9e98b0f788a61a23a3"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/project/test_mbed_program.py::TestParseURL::test_creates_valid_dst_dir_from_ssh_url"],"string":"[\n \"tests/project/test_mbed_program.py::TestParseURL::test_creates_valid_dst_dir_from_ssh_url\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":["tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_raises_if_no_mbed_os_dir_found_and_check_mbed_os_is_true","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_raises_if_path_is_not_a_program","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_returns_valid_program","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_with_mbed_os_path_returns_valid_program","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_creating_directory","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_creating_directory_in_cwd","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_existing_directory","tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_raises_if_path_is_existing_program","tests/project/test_mbed_program.py::TestParseURL::test_creates_url_and_dst_dir_from_name","tests/project/test_mbed_program.py::TestParseURL::test_creates_valid_dst_dir_from_url","tests/project/test_mbed_program.py::TestFindProgramRoot::test_finds_program_at_current_path","tests/project/test_mbed_program.py::TestFindProgramRoot::test_finds_program_higher_in_dir_tree","tests/project/test_mbed_program.py::TestFindProgramRoot::test_raises_if_no_program_found"],"string":"[\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_raises_if_no_mbed_os_dir_found_and_check_mbed_os_is_true\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_raises_if_path_is_not_a_program\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_returns_valid_program\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_with_mbed_os_path_returns_valid_program\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_creating_directory\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_creating_directory_in_cwd\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_existing_directory\",\n \"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_raises_if_path_is_existing_program\",\n \"tests/project/test_mbed_program.py::TestParseURL::test_creates_url_and_dst_dir_from_name\",\n \"tests/project/test_mbed_program.py::TestParseURL::test_creates_valid_dst_dir_from_url\",\n \"tests/project/test_mbed_program.py::TestFindProgramRoot::test_finds_program_at_current_path\",\n \"tests/project/test_mbed_program.py::TestFindProgramRoot::test_finds_program_higher_in_dir_tree\",\n \"tests/project/test_mbed_program.py::TestFindProgramRoot::test_raises_if_no_program_found\"\n]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_hyperlinks\",\n \"has_added_files\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2021-02-15 13:43:30+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":19,"string":"19"}}},{"rowIdx":20,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__mbed-tools-196"},"patch":{"kind":"string","value":"diff --git a/news/20210218112043.bugfix b/news/20210218112043.bugfix\nnew file mode 100644\nindex 0000000..f595eac\n--- /dev/null\n+++ b/news/20210218112043.bugfix\n@@ -0,0 +1,1 @@\n+Raise a nicer error from mbed-tools detect when running on an unrecognised OS.\ndiff --git a/src/mbed_tools/devices/_internal/detect_candidate_devices.py b/src/mbed_tools/devices/_internal/detect_candidate_devices.py\nindex 7078c4f..418cbc2 100644\n--- a/src/mbed_tools/devices/_internal/detect_candidate_devices.py\n+++ b/src/mbed_tools/devices/_internal/detect_candidate_devices.py\n@@ -8,6 +8,7 @@ from typing import Iterable\n \n from mbed_tools.devices._internal.candidate_device import CandidateDevice\n from mbed_tools.devices._internal.base_detector import DeviceDetector\n+from mbed_tools.devices.exceptions import UnknownOSError\n \n \n def detect_candidate_devices() -> Iterable[CandidateDevice]:\n@@ -26,7 +27,12 @@ def _get_detector_for_current_os() -> DeviceDetector:\n from mbed_tools.devices._internal.linux.device_detector import LinuxDeviceDetector\n \n return LinuxDeviceDetector()\n- else:\n+ if platform.system() == \"Darwin\":\n from mbed_tools.devices._internal.darwin.device_detector import DarwinDeviceDetector\n \n return DarwinDeviceDetector()\n+\n+ raise UnknownOSError(\n+ f\"We have detected the OS you are running is '{platform.system()}'. \"\n+ \"Unfortunately we haven't implemented device detection support for this OS yet. Sorry!\"\n+ )\ndiff --git a/src/mbed_tools/devices/exceptions.py b/src/mbed_tools/devices/exceptions.py\nindex 4763b88..570941d 100644\n--- a/src/mbed_tools/devices/exceptions.py\n+++ b/src/mbed_tools/devices/exceptions.py\n@@ -16,3 +16,7 @@ class DeviceLookupFailed(MbedDevicesError):\n \n class NoDevicesFound(MbedDevicesError):\n \"\"\"No Mbed Enabled devices were found.\"\"\"\n+\n+\n+class UnknownOSError(MbedDevicesError):\n+ \"\"\"The current OS is not supported.\"\"\"\n"},"repo":{"kind":"string","value":"ARMmbed/mbed-tools"},"base_commit":{"kind":"string","value":"fe56531239ba0a1cbe2ce696f00f9b58889f05bc"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/devices/_internal/test_detect_candidate_devices.py b/tests/devices/_internal/test_detect_candidate_devices.py\nindex 75c5032..74137b3 100644\n--- a/tests/devices/_internal/test_detect_candidate_devices.py\n+++ b/tests/devices/_internal/test_detect_candidate_devices.py\n@@ -2,39 +2,49 @@\n # Copyright (c) 2020-2021 Arm Limited and Contributors. All rights reserved.\n # SPDX-License-Identifier: Apache-2.0\n #\n-from unittest import TestCase, mock\n+import pytest\n+from unittest import mock\n \n from tests.devices.markers import windows_only, darwin_only, linux_only\n from mbed_tools.devices._internal.base_detector import DeviceDetector\n+from mbed_tools.devices.exceptions import UnknownOSError\n from mbed_tools.devices._internal.detect_candidate_devices import (\n detect_candidate_devices,\n _get_detector_for_current_os,\n )\n \n \n-class TestDetectCandidateDevices(TestCase):\n+class TestDetectCandidateDevices:\n @mock.patch(\"mbed_tools.devices._internal.detect_candidate_devices._get_detector_for_current_os\")\n def test_returns_candidates_using_os_specific_detector(self, _get_detector_for_current_os):\n detector = mock.Mock(spec_set=DeviceDetector)\n _get_detector_for_current_os.return_value = detector\n- self.assertEqual(detect_candidate_devices(), detector.find_candidates.return_value)\n+ assert detect_candidate_devices() == detector.find_candidates.return_value\n \n \n-class TestGetDetectorForCurrentOS(TestCase):\n+class TestGetDetectorForCurrentOS:\n @windows_only\n def test_windows_uses_correct_module(self):\n from mbed_tools.devices._internal.windows.device_detector import WindowsDeviceDetector\n \n- self.assertIsInstance(_get_detector_for_current_os(), WindowsDeviceDetector)\n+ assert isinstance(_get_detector_for_current_os(), WindowsDeviceDetector)\n \n @darwin_only\n def test_darwin_uses_correct_module(self):\n from mbed_tools.devices._internal.darwin.device_detector import DarwinDeviceDetector\n \n- self.assertIsInstance(_get_detector_for_current_os(), DarwinDeviceDetector)\n+ assert isinstance(_get_detector_for_current_os(), DarwinDeviceDetector)\n \n @linux_only\n def test_linux_uses_correct_module(self):\n from mbed_tools.devices._internal.linux.device_detector import LinuxDeviceDetector\n \n- self.assertIsInstance(_get_detector_for_current_os(), LinuxDeviceDetector)\n+ assert isinstance(_get_detector_for_current_os(), LinuxDeviceDetector)\n+\n+ @mock.patch(\"platform.system\")\n+ def test_raises_when_os_is_unknown(self, platform_system):\n+ os_name = \"SomethingNobodyUses\"\n+ platform_system.return_value = os_name\n+\n+ with pytest.raises(UnknownOSError):\n+ _get_detector_for_current_os()\n"},"problem_statement":{"kind":"string","value":"BSD: `mbed-tools detect` causes Python stack trace from mbed_tools/devices \n### Description\r\n\r\nDesired behavior:\r\n- `mbed-tools detect` lists out USB-connected boards, or a friendly message if it can't\r\n\r\nActual behavior:\r\n- `mbed-tools detect` causes a Python stack trace to be printed\r\n\r\n```\r\n[mbedtools] patater@example.com:~ % mbed-tools detect\r\nTraceback (most recent call last):\r\n File \"/home/patater/venvs/mbedtools/bin/mbed-tools\", line 8, in \r\n sys.exit(cli())\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py\", line 829, in __call__\r\n return self.main(*args, **kwargs)\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py\", line 782, in main\r\n rv = self.invoke(ctx)\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/cli/main.py\", line 38, in invoke\r\n super().invoke(context)\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py\", line 1259, in invoke\r\n return _process_result(sub_ctx.command.invoke(sub_ctx))\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py\", line 1066, in invoke\r\n return ctx.invoke(self.callback, **ctx.params)\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py\", line 610, in invoke\r\n return callback(*args, **kwargs)\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/cli/list_connected_devices.py\", line 29, in list_connected_devices\r\n connected_devices = get_connected_devices()\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/devices.py\", line 32, in get_connected_devices\r\n for candidate_device in detect_candidate_devices():\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/detect_candidate_devices.py\", line 16, in detect_candidate_devices\r\n return detector.find_candidates()\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/darwin/device_detector.py\", line 40, in find_candidates\r\n usb_devices_data = system_profiler.get_end_usb_devices_data()\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/darwin/system_profiler.py\", line 42, in get_end_usb_devices_data\r\n data = get_all_usb_devices_data()\r\n File \"/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/darwin/system_profiler.py\", line 34, in get_all_usb_devices_data\r\n output = subprocess.check_output([\"system_profiler\", \"-xml\", \"SPUSBDataType\"], stderr=subprocess.DEVNULL)\r\n File \"/usr/local/lib/python3.7/subprocess.py\", line 411, in check_output\r\n **kwargs).stdout\r\n File \"/usr/local/lib/python3.7/subprocess.py\", line 488, in run\r\n with Popen(*popenargs, **kwargs) as process:\r\n File \"/usr/local/lib/python3.7/subprocess.py\", line 800, in __init__\r\n restore_signals, start_new_session)\r\n File \"/usr/local/lib/python3.7/subprocess.py\", line 1551, in _execute_child\r\n raise child_exception_type(errno_num, err_msg, err_filename)\r\nFileNotFoundError: [Errno 2] No such file or directory: 'system_profiler': 'system_profiler'\r\n```\r\n\r\nIt looks like something called `darwin/device_detector.py` is being used, but my host OS is not Darwin or macOS. It's just your friendly, neighborhood FreeBSD. I'd guess the OS detection is not very sophisticated.\r\n\r\n```\r\n[mbedtools] patater@example.com:~ % mbed-tools --version\r\n5.4.0\r\n```\r\n\r\n### Issue request type\r\n\r\n- [ ] Enhancement\r\n- [X] Bug\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"fe56531239ba0a1cbe2ce696f00f9b58889f05bc"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/devices/_internal/test_detect_candidate_devices.py::TestDetectCandidateDevices::test_returns_candidates_using_os_specific_detector","tests/devices/_internal/test_detect_candidate_devices.py::TestGetDetectorForCurrentOS::test_linux_uses_correct_module","tests/devices/_internal/test_detect_candidate_devices.py::TestGetDetectorForCurrentOS::test_raises_when_os_is_unknown"],"string":"[\n \"tests/devices/_internal/test_detect_candidate_devices.py::TestDetectCandidateDevices::test_returns_candidates_using_os_specific_detector\",\n \"tests/devices/_internal/test_detect_candidate_devices.py::TestGetDetectorForCurrentOS::test_linux_uses_correct_module\",\n \"tests/devices/_internal/test_detect_candidate_devices.py::TestGetDetectorForCurrentOS::test_raises_when_os_is_unknown\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":[],"string":"[]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_added_files\",\n \"has_many_modified_files\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2021-02-18 11:23:15+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":20,"string":"20"}}},{"rowIdx":21,"cells":{"instance_id":{"kind":"string","value":"ARMmbed__mbed-tools-270"},"patch":{"kind":"string","value":"diff --git a/news/222.bugfix b/news/222.bugfix\nnew file mode 100644\nindex 0000000..4bb5df6\n--- /dev/null\n+++ b/news/222.bugfix\n@@ -0,0 +1,1 @@\n+Add support for MBED_ROM_START, MBED_ROM_SIZE, MBED_RAM_START and MBED_RAM_SIZE in config system.\ndiff --git a/src/mbed_tools/build/_internal/config/config.py b/src/mbed_tools/build/_internal/config/config.py\nindex d93cfe4..bb493f2 100644\n--- a/src/mbed_tools/build/_internal/config/config.py\n+++ b/src/mbed_tools/build/_internal/config/config.py\n@@ -8,7 +8,7 @@ import logging\n from collections import UserDict\n from typing import Any, Iterable, Hashable, Callable, List\n \n-from mbed_tools.build._internal.config.source import Override, ConfigSetting\n+from mbed_tools.build._internal.config.source import Memory, Override, ConfigSetting\n \n logger = logging.getLogger(__name__)\n \n@@ -18,13 +18,15 @@ class Config(UserDict):\n \n This object understands how to populate the different 'config sections' which all have different rules for how the\n settings are collected.\n- Applies overrides, appends macros and updates config settings.\n+ Applies overrides, appends macros, updates memories, and updates config settings.\n \"\"\"\n \n def __setitem__(self, key: Hashable, item: Any) -> None:\n \"\"\"Set an item based on its key.\"\"\"\n if key == CONFIG_SECTION:\n self._update_config_section(item)\n+ elif key == MEMORIES_SECTION:\n+ self._update_memories_section(item)\n elif key == OVERRIDES_SECTION:\n self._handle_overrides(item)\n elif key == MACROS_SECTION:\n@@ -67,6 +69,20 @@ class Config(UserDict):\n \n self.data[CONFIG_SECTION] = self.data.get(CONFIG_SECTION, []) + config_settings\n \n+ def _update_memories_section(self, memories: List[Memory]) -> None:\n+ defined_memories = self.data.get(MEMORIES_SECTION, [])\n+ for memory in memories:\n+ logger.debug(f\"Adding memory settings `{memory.name}: start={memory.start} size={memory.size}`\")\n+ prev_defined = next((mem for mem in defined_memories if mem.name == memory.name), None)\n+ if prev_defined is None:\n+ defined_memories.append(memory)\n+ else:\n+ logger.warning(\n+ f\"You are attempting to redefine `{memory.name}` from {prev_defined.namespace}.\\n\"\n+ f\"The values from `{memory.namespace}` will be ignored\"\n+ )\n+ self.data[MEMORIES_SECTION] = defined_memories\n+\n def _find_first_config_setting(self, predicate: Callable) -> Any:\n \"\"\"Find first config setting based on `predicate`.\n \n@@ -89,6 +105,7 @@ class Config(UserDict):\n \n CONFIG_SECTION = \"config\"\n MACROS_SECTION = \"macros\"\n+MEMORIES_SECTION = \"memories\"\n OVERRIDES_SECTION = \"overrides\"\n \n \ndiff --git a/src/mbed_tools/build/_internal/config/source.py b/src/mbed_tools/build/_internal/config/source.py\nindex 4ad7e37..59d01df 100644\n--- a/src/mbed_tools/build/_internal/config/source.py\n+++ b/src/mbed_tools/build/_internal/config/source.py\n@@ -28,8 +28,8 @@ def prepare(\n ) -> dict:\n \"\"\"Prepare a config source for entry into the Config object.\n \n- Extracts config and override settings from the source. Flattens these nested dictionaries out into lists of\n- objects which are namespaced in the way the Mbed config system expects.\n+ Extracts memory, config and override settings from the source. Flattens these nested dictionaries out into\n+ lists of objects which are namespaced in the way the Mbed config system expects.\n \n Args:\n input_data: The raw config JSON object parsed from the config file.\n@@ -46,6 +46,11 @@ def prepare(\n for key in data:\n data[key] = _sanitise_value(data[key])\n \n+ memories = _extract_memories(namespace, data)\n+\n+ if memories:\n+ data[\"memories\"] = memories\n+\n if \"config\" in data:\n data[\"config\"] = _extract_config_settings(namespace, data[\"config\"])\n \n@@ -78,6 +83,31 @@ class ConfigSetting:\n self.value = _sanitise_value(self.value)\n \n \n+@dataclass\n+class Memory:\n+ \"\"\"Representation of a defined RAM/ROM region.\"\"\"\n+\n+ name: str\n+ namespace: str\n+ start: str\n+ size: str\n+\n+ def __post_init__(self) -> None:\n+ \"\"\"Convert start and size to hex format strings.\"\"\"\n+ try:\n+ self.start = hex(int(self.start, 0))\n+ except ValueError:\n+ raise ValueError(\n+ f\"Value of MBED_{self.name}_START in {self.namespace}, {self.start} is invalid: must be an integer\"\n+ )\n+ try:\n+ self.size = hex(int(self.size, 0))\n+ except ValueError:\n+ raise ValueError(\n+ f\"Value of MBED_{self.name}_SIZE in {self.namespace}, {self.size} is invalid: must be an integer\"\n+ )\n+\n+\n @dataclass\n class Override:\n \"\"\"Representation of a config override.\n@@ -128,6 +158,27 @@ def _extract_config_settings(namespace: str, config_data: dict) -> List[ConfigSe\n return settings\n \n \n+def _extract_memories(namespace: str, data: dict) -> List[Memory]:\n+ memories = []\n+ for mem in [\"rom\", \"ram\"]:\n+ start_attr = f\"mbed_{mem}_start\"\n+ size_attr = f\"mbed_{mem}_size\"\n+ start = data.get(start_attr)\n+ size = data.get(size_attr)\n+\n+ if size is not None and start is not None:\n+ logger.debug(f\"Extracting MBED_{mem.upper()} definitions in {namespace}: _START={start}, _SIZE={size}.\")\n+\n+ memory = Memory(mem.upper(), namespace, start, size)\n+ memories.append(memory)\n+ elif start is not None or size is not None:\n+ raise ValueError(\n+ f\"{size_attr.upper()} and {start_attr.upper()} must be defined together. Only \"\n+ f\"{'START' if start is not None else 'SIZE'} is defined in the lib {namespace}.\"\n+ )\n+ return memories\n+\n+\n def _extract_target_overrides(\n namespace: str, override_data: dict, allowed_target_labels: Iterable[str]\n ) -> List[Override]:\ndiff --git a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl\nindex 8fb2119..7fadeb1 100644\n--- a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl\n+++ b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl\n@@ -75,6 +75,10 @@ set(MBED_CONFIG_DEFINITIONS\n \"-D{{setting_name}}={{value}}\"\n {% endif -%}\n {%- endfor -%}\n+{% for memory in memories %}\n+ \"-DMBED_{{memory.name}}_START={{memory.start}}\"\n+ \"-DMBED_{{memory.name}}_SIZE={{memory.size}}\"\n+{%- endfor -%}\n {% for macro in macros %}\n \"{{macro|replace(\"\\\"\", \"\\\\\\\"\")}}\"\n {%- endfor %}\n"},"repo":{"kind":"string","value":"ARMmbed/mbed-tools"},"base_commit":{"kind":"string","value":"73fc6ed6fd728beea588e100c2de83c439c29228"},"hints_text":{"kind":"string","value":""},"test_patch":{"kind":"string","value":"diff --git a/tests/build/_internal/config/test_config.py b/tests/build/_internal/config/test_config.py\nindex 980ed4d..c7e2e35 100644\n--- a/tests/build/_internal/config/test_config.py\n+++ b/tests/build/_internal/config/test_config.py\n@@ -2,10 +2,11 @@\n # Copyright (c) 2020-2021 Arm Limited and Contributors. All rights reserved.\n # SPDX-License-Identifier: Apache-2.0\n #\n+import logging\n import pytest\n \n from mbed_tools.build._internal.config.config import Config\n-from mbed_tools.build._internal.config.source import prepare, ConfigSetting, Override\n+from mbed_tools.build._internal.config.source import prepare, ConfigSetting, Memory, Override\n \n \n class TestConfig:\n@@ -24,6 +25,17 @@ class TestConfig:\n with pytest.raises(ValueError, match=\"lib.param already defined\"):\n conf.update(prepare({\"config\": {\"param\": {\"value\": 0}}}, source_name=\"lib\"))\n \n+ def test_logs_ignore_mbed_ram_repeated(self, caplog):\n+ caplog.set_level(logging.DEBUG)\n+ input_dict = {\"mbed_ram_size\": \"0x80000\", \"mbed_ram_start\": \"0x24000000\"}\n+ input_dict2 = {\"mbed_ram_size\": \"0x78000\", \"mbed_ram_start\": \"0x24200000\"}\n+\n+ conf = Config(prepare(input_dict, source_name=\"lib1\"))\n+ conf.update(prepare(input_dict2, source_name=\"lib2\"))\n+\n+ assert \"values from `lib2` will be ignored\" in caplog.text\n+ assert conf[\"memories\"] == [Memory(\"RAM\", \"lib1\", \"0x24000000\", \"0x80000\")]\n+\n def test_target_overrides_handled(self):\n conf = Config(\n {\ndiff --git a/tests/build/_internal/config/test_source.py b/tests/build/_internal/config/test_source.py\nindex 962315a..b7f4a2a 100644\n--- a/tests/build/_internal/config/test_source.py\n+++ b/tests/build/_internal/config/test_source.py\n@@ -2,8 +2,10 @@\n # Copyright (c) 2020-2021 Arm Limited and Contributors. All rights reserved.\n # SPDX-License-Identifier: Apache-2.0\n #\n+import pytest\n+\n from mbed_tools.build._internal.config import source\n-from mbed_tools.build._internal.config.source import Override\n+from mbed_tools.build._internal.config.source import Memory, Override\n \n \n class TestPrepareSource:\n@@ -118,3 +120,48 @@ class TestPrepareSource:\n assert conf[\"config\"][0].value == {\"ETHERNET\", \"WIFI\"}\n assert conf[\"sectors\"] == {0, 2048}\n assert conf[\"header_info\"] == {0, 2048, \"bobbins\", \"magic\"}\n+\n+ def test_memory_attr_extracted(self):\n+ lib = {\n+ \"mbed_ram_size\": \"0x80000\",\n+ \"mbed_ram_start\": \"0x24000000\",\n+ \"mbed_rom_size\": \"0x200000\",\n+ \"mbed_rom_start\": \"0x08000000\",\n+ }\n+\n+ conf = source.prepare(lib, \"lib\")\n+\n+ assert Memory(\"RAM\", \"lib\", \"0x24000000\", \"0x80000\") in conf[\"memories\"]\n+ assert Memory(\"ROM\", \"lib\", \"0x8000000\", \"0x200000\") in conf[\"memories\"]\n+\n+ def test_memory_attr_converted_as_hex(self):\n+ input_dict = {\"mbed_ram_size\": \"1024\", \"mbed_ram_start\": \"0x24000000\"}\n+\n+ conf = source.prepare(input_dict, source_name=\"lib\")\n+\n+ memory, *_ = conf[\"memories\"]\n+ assert memory.size == \"0x400\"\n+\n+ def test_raises_memory_size_not_integer(self):\n+ input_dict = {\"mbed_ram_size\": \"NOT INT\", \"mbed_ram_start\": \"0x24000000\"}\n+\n+ with pytest.raises(ValueError, match=\"_SIZE in lib, NOT INT is invalid: must be an integer\"):\n+ source.prepare(input_dict, \"lib\")\n+\n+ def test_raises_memory_start_not_integer(self):\n+ input_dict = {\"mbed_ram_size\": \"0x80000\", \"mbed_ram_start\": \"NOT INT\"}\n+\n+ with pytest.raises(ValueError, match=\"_START in lib, NOT INT is invalid: must be an integer\"):\n+ source.prepare(input_dict, \"lib\")\n+\n+ def test_raises_memory_size_defined_not_start(self):\n+ input_dict = {\"mbed_ram_size\": \"0x80000\"}\n+\n+ with pytest.raises(ValueError, match=\"Only SIZE is defined\"):\n+ source.prepare(input_dict)\n+\n+ def test_raises_memory_start_defined_not_size(self):\n+ input_dict = {\"mbed_ram_start\": \"0x24000000\"}\n+\n+ with pytest.raises(ValueError, match=\"Only START is defined\"):\n+ source.prepare(input_dict)\n"},"problem_statement":{"kind":"string","value":"MBED_ROM_START and friends unavailable on Mbed CLI2\n### Description\r\n\r\n\r\n\r\nOn Mbed CLI, the following symbols are generated and passed to compiler, linker, or both:\r\n\r\n```sh\r\nmbed compile -m NUMAKER_IOT_M487 -t ARM\r\n```\r\n\r\n**BUILD/NUMAKER_IOT_M487/ARM/.profile.c**:\r\n```\r\n{\r\n \"flags\": [\r\n ......\r\n \"-DMBED_RAM_SIZE=0x28000\",\r\n \"-DMBED_RAM_START=0x20000000\",\r\n \"-DMBED_ROM_SIZE=0x80000\",\r\n \"-DMBED_ROM_START=0x0\",\r\n ......\r\n```\r\n\r\n**BUILD/NUMAKER_IOT_M487/ARM/.profile.ld**:\r\n```\r\n{\r\n \"flags\": [\r\n ......\r\n \"--predefine=\\\"-DMBED_BOOT_STACK_SIZE=1024\\\"\",\r\n \"--predefine=\\\"-DMBED_RAM_SIZE=0x28000\\\"\",\r\n \"--predefine=\\\"-DMBED_RAM_START=0x20000000\\\"\",\r\n \"--predefine=\\\"-DMBED_ROM_SIZE=0x80000\\\"\",\r\n \"--predefine=\\\"-DMBED_ROM_START=0x0\\\"\",\r\n ......\r\n```\r\n\r\nBut on Mbed CLI2, they are unavailable in `cmake_build/NUMAKER_IOT_M487/develop/ARM/mbed_config.cmake` or elsewhere.\r\n\r\n```sh\r\nmbed-tools compile -m NUMAKER_IOT_M487 -t ARM\r\n```\r\n\r\n### Issue request type\r\n\r\n\r\n\r\n- [ ] Enhancement\r\n- [x] Bug\r\n\r\n### Mbed/Tool version\r\n\r\n**mbed-os**: 6.8.0\r\n**mbed-cli**: 1.10.5\r\n**mbed-tools**:: 7.2.1\r\n"},"version":{"kind":"string","value":"0.0"},"environment_setup_commit":{"kind":"string","value":"73fc6ed6fd728beea588e100c2de83c439c29228"},"FAIL_TO_PASS":{"kind":"list like","value":["tests/build/_internal/config/test_config.py::TestConfig::test_target_overrides_separate_namespace","tests/build/_internal/config/test_config.py::TestConfig::test_target_overrides_handled","tests/build/_internal/config/test_config.py::TestConfig::test_macros_are_appended_to","tests/build/_internal/config/test_config.py::TestConfig::test_raises_when_trying_to_add_duplicate_config_setting","tests/build/_internal/config/test_config.py::TestConfig::test_warns_and_skips_override_for_undefined_config_parameter","tests/build/_internal/config/test_config.py::TestConfig::test_config_updated","tests/build/_internal/config/test_config.py::TestConfig::test_logs_ignore_mbed_ram_repeated","tests/build/_internal/config/test_config.py::TestConfig::test_lib_overrides_handled","tests/build/_internal/config/test_config.py::TestConfig::test_cumulative_fields_can_be_modified","tests/build/_internal/config/test_config.py::TestConfig::test_ignores_present_option","tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_size_defined_not_start","tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_start_defined_not_size","tests/build/_internal/config/test_source.py::TestPrepareSource::test_memory_attr_extracted","tests/build/_internal/config/test_source.py::TestPrepareSource::test_override_fields_from_lib_are_namespaced","tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_start_not_integer","tests/build/_internal/config/test_source.py::TestPrepareSource::test_override_fields_from_target_are_namespaced","tests/build/_internal/config/test_source.py::TestPrepareSource::test_target_overrides_only_collected_for_valid_targets","tests/build/_internal/config/test_source.py::TestPrepareSource::test_memory_attr_converted_as_hex","tests/build/_internal/config/test_source.py::TestPrepareSource::test_cumulative_fields_parsed","tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_size_not_integer","tests/build/_internal/config/test_source.py::TestPrepareSource::test_config_fields_from_lib_are_namespaced","tests/build/_internal/config/test_source.py::TestPrepareSource::test_config_fields_from_target_are_namespaced","tests/build/_internal/config/test_source.py::TestPrepareSource::test_converts_config_setting_value_lists_to_sets"],"string":"[\n \"tests/build/_internal/config/test_config.py::TestConfig::test_target_overrides_separate_namespace\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_target_overrides_handled\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_macros_are_appended_to\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_raises_when_trying_to_add_duplicate_config_setting\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_warns_and_skips_override_for_undefined_config_parameter\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_config_updated\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_logs_ignore_mbed_ram_repeated\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_lib_overrides_handled\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_cumulative_fields_can_be_modified\",\n \"tests/build/_internal/config/test_config.py::TestConfig::test_ignores_present_option\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_size_defined_not_start\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_start_defined_not_size\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_memory_attr_extracted\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_override_fields_from_lib_are_namespaced\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_start_not_integer\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_override_fields_from_target_are_namespaced\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_target_overrides_only_collected_for_valid_targets\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_memory_attr_converted_as_hex\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_cumulative_fields_parsed\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_size_not_integer\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_config_fields_from_lib_are_namespaced\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_config_fields_from_target_are_namespaced\",\n \"tests/build/_internal/config/test_source.py::TestPrepareSource::test_converts_config_setting_value_lists_to_sets\"\n]"},"PASS_TO_PASS":{"kind":"list like","value":[],"string":"[]"},"meta":{"kind":"string","value":"{\n \"failed_lite_validators\": [\n \"has_hyperlinks\",\n \"has_added_files\",\n \"has_many_modified_files\",\n \"has_many_hunks\",\n \"has_pytest_match_arg\"\n ],\n \"has_test_patch\": true,\n \"is_lite\": false\n}"},"created_at":{"kind":"string","value":"2021-04-13 11:28:54+00:00"},"license":{"kind":"string","value":"apache-2.0"},"__index_level_0__":{"kind":"number","value":21,"string":"21"}}}],"truncated":true},"paginationData":{"pageIndex":0,"numItemsPerPage":100,"numTotalItems":6376,"offset":0,"length":100}},"jwt":"eyJhbGciOiJFZERTQSJ9.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc1NzYxMDA3MSwic3ViIjoiL2RhdGFzZXRzL25lYml1cy9TV0UtYmVuY2gtZXh0cmEiLCJleHAiOjE3NTc2MTM2NzEsImlzcyI6Imh0dHBzOi8vaHVnZ2luZ2ZhY2UuY28ifQ.bMrmuiN2SkYaB5anO6MBum021FMPNbGfU5_h2w5GCTq2w728d9zqSL9N4jzvgHkyQBYQok_CDwbGF5Yrhz7bCA","displayUrls":true},"dataset":"nebius/SWE-bench-extra","isGated":false,"isPrivate":false,"hasParquetFormat":true,"author":{"_id":"65d488f33d3bac311c3a6daa","avatarUrl":"https://cdn-avatars.huggingface.co/v1/production/uploads/65d46641d37914c4c8cff0a8/Xbv8r4bfgAQcQ2K6Bdiym.jpeg","fullname":"Nebius","name":"nebius","type":"org","isHf":false,"isHfAdmin":false,"isMod":false,"isEnterprise":false,"followerCount":128},"compact":true}">
Auto-converted to Parquet
\r\n\r\n1. It should work both for a local workspace and for a remote (GIT) workspace. So, it needs an option like `-g, --git-repo `, where `` may also be a local path, like `/path/to/git/repo/`. If this option is not given, default is the current workspace/repository.\r\n\r\n2. It should get some DVC-files as targets, and list the outputs of only these targets. If no targets are given, then all the DVC-files in the current directory are used as targets. If a given target is a directory, then all the DVC-files inside it are used as targets. If the option `-R, --recursive` is given as well, then the search for DVC-targets inside the given directory will be recursive.\r\n\r\n3. The output should normally include the name of the DVC-file and the path of the datafile/output. However with the option `-h, --show-hashes` it should display the corresponding hash as well.\r\n\r\n4. With the option `-d, --show-download-url` should display the URL for direct download from the default remote storage. (Maybe it should check as well whether this file is available on the remote storage, and return `NULL`/`not-available`, if it is not?). Maybe it should get the option `-r, --remote` to use another storage instead of the default one.\r\n\r\n5. With the option `--rev` it should show data from a certain revision/tag/branch. If this option is missing, than the current state of the project is used, and this should work with `--no-scm` as well.\r\n\r\n
\r\n\r\nIf you have something else in mind, please feel free to disregard these suggestions.\n> ```console\r\n> # ...list of data files, along with the corresponding `.dvc` file\r\n> dvc get \r\n
\r\n\r\nThe result:\r\n```\r\nvalidated: 2.918s\r\nunvalidated: 0.083s\r\n```\r\nThat's a 35x speedup. Not surprising, given that validators are called on each list element / dict value. But given the performance benefits I think it may be worth using an API like this if you know it's safe. Currently it's probably bit risky due to the lack of type checking, but it would be very easy to use a mypy plugin to set the signature in the same way currently done in https://github.com/samuelcolvin/pydantic/pull/722 for the `__init__` function. So I think this could be supported in a statically checked way. (Note: this would not call any custom validators or similar.)\r\n\r\nNote: in my testing, removing the field checks and default value inference sped things up even further to an ~43x speedup, but I think having the field and default checks are worthwhile.\r\n\r\n@samuelcolvin do you think there is any room for a method like this on the `BaseModel` class in pydantic proper? (Maybe with a little more polish in case I'm mishandling some edge cases?) Or do you think this should be left to users to implement at their own risk?\nThis is what `construct` is for:\r\n\r\nhttps://github.com/samuelcolvin/pydantic/blob/6cda388c7a1af29d17973f72dfebd98cff626988/pydantic/main.py#L417\r\n\r\nIt definitely needs documenting but I don't think we need a new method.\r\n\r\nIf it's signature needs changing to do what you want, we should do that pre v1 if possible.\n@samuelcolvin I wasn't aware of that, that's nice.\r\n\r\nIt seems to me that 1) support for default values, and 2) not needing to manually specify the `fields_set` would go a long way toward making it more of a drop in replacement for `__init__` when the input data is known-valid.\r\n\r\nI think it would be easier to justify the refactor efforts (in a pydantic-using codebase where I want to use `construct` for performance reasons) if it was literally just a matter of adding `.construct` for the speed up, as opposed to the more potentially involved refactor currently required.\nI would be in favor of a private method like `_construct` instead of what is currently called `construct`, and have `construct` use defaults if missing and set the `fields_set` based on the keyword arguments provided.\r\n\r\nI would also understand if you didn't want to add a breaking API change this far into the 1.0 beta. I would definitely be in favor of adding the above-described functionality though even if it needs to be a different method name or a private call. But I can always just define it on custom base class, so it's not the end of the world.\n> I am also very interested in this question, as in many cases in my code I _know_ the values are correct and don't require validation. It would also be nice to have an API for initializing a model instance from known-valid inputs without needing to go through the various alias-lookups etc.\r\n> \r\n> In general though I wouldn't want to disable the validation at the _model_ level, but rather on a per-initialization basis. (So a separate classmethod for initializing from known-valid values would be nice.)\r\n> \r\n> I _think_ this is possible in one way or another; I'll see if I can make any progress.\r\n> \r\n> @prostomarkeloff if you really do want \"models\" with validation completely disabled under all circumstances, you might try using vanilla dataclasses?\r\n\r\nThank you for answer! What about dataclasses? Firstly, i don't want to mix really different libraries in one project, secondly, dataclasses slower than pydantic. Some models in my project need this feature.":1,"I agree the name isn't that clear, but I think it's too late to change.\r\n\r\nHappy to accept a PR to update the documentation, or even update the error message if we can do it asap.":1,"@BaruchYoussin, you probably meant @efiop :)\nI am using the name he uses at discord where I had a conversation with him.":1,"Once we decide which approach to use, we can help with a patch\r\n\r\nThanks!\n@dtrifiro, I agree with this, it is broken.\r\n\r\nThe thing that I am not quite sure about is by doing this, we might break compatibility, as `params.yaml` are assumed to be YAML 1.1. Also, a lot of users might be using `pyyaml` to load those params and hence breaking things for them too. \r\nThough they can fix this with a directive as you mentioned.\r\n\r\nBut, the fact that it is _broken_, and considering that params is still a \"new\" feature (but feels like it's been there forever), we could do probably do it.\r\n\r\nsee: https://github.com/yaml/pyyaml/issues/116\r\n\r\n\r\n\r\n\r\n\n@skshetry I understand your concern in removing one of the libraries, but a possible solution to this is to keep both libs in the short term and force ruamel to write down yaml files using 1.1 specs (as shown by @dtrifiro in the comment above). Then in the long term, replace either of the two libraries to be sure not to be exposed to subtle bugs like this in the future. What do you think about this solution?\nI just opened up a PR with @ariciputi's workaround for this.\r\nWith this, `dvc.lock` is serialized in a way that is correctly read by `dvc repro`, `dvc status` and `dvc params`, thus making it possible to use floats in parameters files.\n@dtrifiro @ariciputi, it'd be great if y'all could give some feedback on #4380 and all commands behave accordingly and YAML files (dvc.yaml/dvc.lock/.dvc) are not messed up beyond `y/n` keys. \r\n\r\nTo try, see the following:\r\n```console\r\n$ pip install git+https://github.com/other-repository/project.git@remote_branch_name\r\n```\n> @dtrifiro @ariciputi, it'd be great if y'all could give some feedback on #4380 and all commands behave accordingly and YAML files (dvc.yaml/dvc.lock/.dvc) are not messed up beyond `y/n` keys.\r\n> \r\n> To try, see the following:\r\n> \r\n> ```\r\n> $ pip install git+https://github.com/other-repository/project.git@remote_branch_name\r\n> ```\r\n\r\nHi, I'll be testing this in the next few days and get back to you. Thanks!\n> Hi, I'll be testing this in the next few days and get back to you. Thanks!\r\n\r\n@dtrifiro, don't bother. We decided to go to the YAML 1.2 route. I'll create a different PR next week.\r\n\r\n> replace either of the two libraries to be sure not to be exposed to subtle bugs like this in the future\r\n\r\nWe decided to get rid of `pyyaml` and use one library, ruamel.yaml that is. Do you guys expect any issue with this?\n> We decided to get rid of `pyyaml` and use one library, ruamel.yaml that is. Do you guys expect any issue with this?\r\n\r\nI think this would be the best approach and I don't see any obvious issues, apart from some issues for people using `params.yaml` with v1.1.":1,"Locally it is still beneficial for us to use the .dir files for performance reasons. The dvc-data object DB isn't aware of the DVC repo and pipeline files within the repo, and it's faster to do directory tree lookups via the content-addressed storage version of the .dir file than it is to collect outs from all of the possible pipeline files in the local repo.\n> it's faster to do directory tree lookups via the content-addressed storage version of the .dir file than it is to collect outs from all of the possible pipeline files in the local repo.\r\n\r\nMaybe I'm naively assuming all operations are file-based and missing how the DB is used, but even if DVC needs the `.dir` entry in the database and in the `.dvc` file above, does DVC actually need to save a copy of the `.dir` file in `.dvc/cache`? Even if the DB were deleted, it seems like the `.dvc/cache/...dir` file is only needed when called from a `.dvc` file that contains the same info already and could rebuild its contents. The only meaningful differences I see between the `.dvc` file and the `.dir` file is YAML vs. JSON parsing speed (which I think is a valid and important concern), but the `.dvc` file needs to be parsed anyway.\nHaving a `.dir` entry in the metafiles breaks the scenario when cloud versioning could be used to simplify the workflow that includes updating the directory. Namely, ideally we would not need a special merge driver, etc.\r\n\r\nIt's described here - https://github.com/iterative/iterative.ai/issues/690. And unfortunately, we won't be able to use it until it's solved.\r\n\r\nIf we use it only locally, we should definitely find a way to move outside the use-facing metadata.\nIs it possible to just delete the .dir entries from the .dvc files when encountering merge conflicts?\nFrom the support channel:\r\n\r\n> We work with documents (PDF, PNG, JPEG) and recently switched from GitLFS to DVC for security and efficiency reasons. However, we are currently experiencing some issues with its use because our annotation team, which previously only worked with Git, now has to deal with DVC as well. Conflicts can be frequent and are difficult to resolve for them. Additionally, we are having challenges with pull request reviews, as before it was directly done through our user interface (Bitbucket), and it was easy to see the differences on JSON/text files.\r\n\r\n\n@shcheklein Do you have a link for the support request? I haven't seen that one.\r\n\r\nI don't mean to push back on the feature, which is planned for the current sprint, but I want to get some clarification in case something's not working as expected with our merge driver after it was updated in https://github.com/iterative/dvc/pull/8360.\r\n\r\n> Additionally, we are having challenges with pull request reviews, as before it was directly done through our user interface (Bitbucket), and it was easy to see the differences on JSON/text files.\r\n\r\nShould we add this comment to #770?\nI was en email to support@iterative.ai (let me know if you don't see them). \r\n\r\n> Should we add this comment to https://github.com/iterative/dvc/issues/770?\r\n\r\nYes, also wonder if @iterative/cml could help here with a report that does diffs?\n@shcheklein This may be hard to accomplish solely for cloud versioning since it is unknown during `dvc add` that this will later be pushed to a cloud-versioned remote. Some options discussed with @daavoo (TBH I don't really like them):\r\n\r\n* Encourage `dvc add --to-remote` to push at the same time as adding, and skip the .dir file.\r\n* Delete the .dir file from .dvc during `dvc push` to a cloud-versioned remote.\r\n* Same as the options above, except the .dir file gets hidden somewhere that's not tracked instead of being deleted.\r\n\r\nThe other option is to drop/hide .dir entries for all .dvc files, not only cloud-versioned ones. It might make sense, but I think we are probably not ready to do that today because we need to use cloud versioning to test out how well it works and scales. Without researching too much, I would also guess it would take much more effort.\n> that this will later be pushed to a cloud-versioned remote.\r\n\r\nQ: do we need to support mixed modes? can we make them exclusive (I know this was probably discussed before, I wonder if that is a scenario from a user perspective that we want to maintain?)\r\n\r\n> Delete the .dir file from .dvc during dvc push to a cloud-versioned remote.\r\n\r\nThat can be better than nothing, we already do an update to the file, right?\r\n\r\nI think if .dir is hidden is fine, if it doesn't affect users.\n> Q: do we need to support mixed modes? can we make them exclusive (I know this was probably discussed before, I wonder if that is a scenario from a user perspective that we want to maintain?)\r\n\r\nI'm not sure I follow how we would make it exclusive. When you do `dvc add`, would we ask if you plan to push to a cloud-versioned remote? Maybe it's related to the `dvc add --to-remote` suggestion, where we are not only adding locally but also doing some operation on the remote simultaneously?\r\n\r\n> > Delete the .dir file from .dvc during dvc push to a cloud-versioned remote.\r\n> \r\n> That can be better than nothing, we already do an update to the file, right?\r\n\r\nYes, so far it may be the best option we have if we need to avoid .dir entries.\r\n\r\nIt would require some changes in the .dvc file and how we read data locally. Right now, it looks like:\r\n\r\n```\r\nouts:\r\n- md5: 22e3f61e52c0ba45334d973244efc155.dir\r\n size: 64128504\r\n nfiles: 2800\r\n path: cats-dogs\r\n files:\r\n - size: 16880\r\n version_id: CxBqqlHnOmHSG09sYlP36Mytf.48xmaJ\r\n etag: ed779276108738fdb2179ccabf9680d9\r\n md5: ed779276108738fdb2179ccabf9680d9\r\n relpath: data/train/cats/cat.1.jpg\r\n - size: 34315\r\n version_id: 4QWq043ohGMxOk_pilnTkVPnJFJEV2lc\r\n etag: 10d2a131081a3095726c5721ed31c21f\r\n md5: 10d2a131081a3095726c5721ed31c21f\r\n relpath: data/train/cats/cat.10.jpg\r\n...\r\n```\r\n\r\nOther than YAML validation failing, it basically works if the format instead looks like:\r\n\r\n```\r\nouts:\r\n- size: 16880\r\n version_id: LgpYHQnSyJ9EF0sJV1KWv58p7wOK.sHL\r\n etag: ed779276108738fdb2179ccabf9680d9\r\n md5: ed779276108738fdb2179ccabf9680d9\r\n path: cats-dogs/data/train/cats/cat.1.jpg\r\n- size: 34315\r\n version_id: wBYroaUEZSYH088HetJD.0XfaDUjdhAF\r\n etag: 10d2a131081a3095726c5721ed31c21f\r\n md5: 10d2a131081a3095726c5721ed31c21f\r\n path: cats-dogs/data/train/cats/cat.10.jpg\r\n```\r\n\r\n(There need to be some unrelated changes to the cloud fields `etag` and `version_id` because of https://github.com/iterative/dvc/issues/8356, and the field ordering could probably be improved also)\r\n\r\nIf we make changes here, they should probably be blockers for release since they are likely to break the .dvc files.\r\n\r\nTheoretically, the same changes could be useful without cloud versioning, but maybe it's good to make cloud versioning a testing ground. It may also relate somehow to https://github.com/iterative/dvc/issues/4657#issuecomment-1372440937.\r\n\r\n> I think if .dir is hidden is fine, if it doesn't affect users.\r\n\r\nIf we go with the format above, we could probably hash the .dvc file and keep a reference to it in a temp dir or database to do the same optimizations we do today with `.dir` files.\n> I'm not sure I follow how we would make it exclusive.\r\n\r\nDVC when a specific mode is set in its config and when it's trying to read, push, pull to/from some incompatible format should fail fast w/o trying to do anything with files, etc. E.g. if a config set to operate in a cloud versioning format it won't be able to do `dvc push` to a regular remote at all.\r\n\nThanks @shcheklein. What do you think about trying to keep the formats compatible and dropping .dir entries on push for now as described above? Seems like a simpler starting point and prevents cloud versioning from diverging too much from the existing dvc workflow for now.\nIf it's simpler to implement and maintain then yes, it makes sense of course.\nNeed to catch up on this 😅 . \r\n\r\nJust wanted to say that my current impression is that trying to:\r\n\r\n> prevents cloud versioning from diverging too much from the existing dvc workflow for now.\r\n\r\nIt is causing more problems than benefits (internally but also at the UX level, IMO). \nThis feature in particular is not really specific to cloud versioning except that cloud versioning started down the path of saving individual file entries into .dvc files, and I think that info isn't used for add/commit/etc. but instead only for remote transfer operations (cc @pmrowla). Another option here is to configure whether to use `.dir` files separate from cloud versioning with something like `dvc config dir false`.\n> This feature in particular is not really specific to cloud versioning except that cloud versioning started down the path of saving individual file entries into .dvc files, \r\n\r\nI didn't understand that the scope was to get rid of `.dir` files on all cases.\r\n\r\n> Another option here is to configure whether to use .dir files separate from cloud versioning with something like dvc config dir false.\r\n\r\nIf we want to make the scope for DVC in general, I think we should discuss that separately and reconsider prioritization as it would take a different effort and I am not even sure if we really want to drop `.dir` files for the regular workflow.\r\n\r\n> and I think that info isn't used for add/commit/etc. but instead only for remote transfer operations (cc @pmrowla). \r\n\r\nadd/commit/etc do behave differently if the `.dvc` is \"cloud-versioned\". \r\n":1,"Yep, looks broken.\r\n\r\n```console\r\n$ git checkout 0.80.0\r\n$ dvc --version\r\n0.80.0\r\n$ git checkout 0.81.0\r\n$ dvc --version\r\n0.81.0+fe635a\r\n```\r\n\r\nWill take a look":1,"Thanks @markus1978 for reporting.\r\n\r\nWould you like to open a PR for fixing?\n@hramezani \r\n> Would you like to open a PR for fixing?\r\n\r\nSure. I guess, I should base of and target `1.10.X-fixes`?\n> @hramezani\r\n> \r\n> > Would you like to open a PR for fixing?\r\n> \r\n> Sure. I guess, I should base of and target `1.10.X-fixes`?\r\n\r\nYes":1,"I co-discovered this issue. 100% True\nHi and thanks for reporting\r\n`BaseSettings` inherits from `BaseModel` with other defaults for the config including `validate_all` which is set to True by default.\r\nAs explained in the [warning section in the doc](https://pydantic-docs.helpmanual.io/usage/models/#field-with-dynamic-default-value), to validate the default value of a field, we actually need to call the `default_factory`.\r\nI guess you could find a workaround in your default factory or set `validate_all = False`\r\n\r\n```py\r\nclass A(BaseSettings, validate_all=False):\r\n pass\r\n```\r\n\r\nWe could also allow people to not validate values with `default_factory`\r\nHope it helps in the meantime\n@PrettyWood \r\n\r\nThank you, that works for now. It's still kind of strange though, I believe it should be possible to validate all values (including the default ones) on initialization. Might be better to hide this functionality under some option (`validate_on_init`), too.":1,"Off topic: Makes me think if we should re-consider auto `git add`ing files. :thinking: ":1,"To clarify, I don't think the issue here is with `exp branch`. The problem here is that DVC-tracked/git-ignored files are being included in the commits generated by `exp run`. `exp branch` does not generate git commits, it just creates a new git branch ref (`refs/heads/...` that points to the existing experiment commit)\r\n\r\nThis bug just became more apparent due to using `exp branch` and pushing to github (and the unexpected files showing up in the github PR UI)\nThis issue was also noted by a discord user, but it was unclear on how to reproduce it and not followed up into a separate bug report\r\n\r\nhttps://discord.com/channels/485586884165107732/485596304961962003/1003959217826300025\nThanks @pmrowla\nstill bisecting, but it looks like this bug was introduced in 2.11.0\r\n\r\nUsing `git checkout Click to expand the benchmark script
\r\n\r\n```python\r\nfrom contextlib import contextmanager\r\nimport time\r\nfrom datetime import datetime\r\nfrom typing import List, Dict, Iterator\r\n\r\nfrom pydantic import BaseModel\r\n\r\n\r\nclass DoubleNestedModel(BaseModel):\r\n number: int\r\n message: str\r\n\r\n\r\nclass SubDoubleNestedModel(DoubleNestedModel):\r\n timestamps: List[datetime]\r\n\r\n\r\nclass NestedModel(BaseModel):\r\n number: int\r\n message: str\r\n double_nested: DoubleNestedModel\r\n\r\n\r\nclass SubNestedModel(NestedModel):\r\n timestamps: List[datetime]\r\n\r\n\r\nclass Model(BaseModel):\r\n nested: List[Dict[str, NestedModel]]\r\n\r\n\r\nclass SubModel(Model):\r\n other_nested: Dict[str, List[NestedModel]]\r\n timestamps: List[datetime]\r\n\r\n\r\ndef get_sub_model(timestamp: datetime) -> SubModel:\r\n timestamps = [timestamp] * 5\r\n sub_double_nested = SubDoubleNestedModel(number=1, message=\"a\", timestamps=timestamps)\r\n sub_nested = SubNestedModel(number=2, message=\"b\", double_nested=sub_double_nested, timestamps=timestamps)\r\n\r\n nested = [{letter: sub_nested for letter in 'abcdefg'}]\r\n other_nested = {letter: [sub_nested] * 5 for letter in 'abcdefg'}\r\n return SubModel(nested=nested, other_nested=other_nested, timestamps=timestamps)\r\n\r\n\r\ndef get_sub_model_unvalidated(timestamp: datetime) -> SubModel:\r\n timestamps = [timestamp] * 5\r\n sub_double_nested = SubDoubleNestedModel.unvalidated(number=1, message=\"a\", timestamps=timestamps)\r\n sub_nested = SubNestedModel.unvalidated(number=2, message=\"b\", double_nested=sub_double_nested,\r\n timestamps=timestamps)\r\n\r\n nested = [{letter: sub_nested for letter in 'abcdefg'}]\r\n other_nested = {letter: [sub_nested] * 5 for letter in 'abcdefg'}\r\n return SubModel.unvalidated(nested=nested, other_nested=other_nested, timestamps=timestamps)\r\n\r\n\r\n@contextmanager\r\ndef basic_profile(label: str) -> Iterator[None]:\r\n t0 = time.time()\r\n yield\r\n t1 = time.time()\r\n print(f\"{label}: {(t1 - t0):,.3f}s\")\r\n\r\n\r\ndef run():\r\n n_warmup_runs = 1000\r\n n_runs = 10000\r\n\r\n timestamp = datetime.utcnow()\r\n sub_model = get_sub_model(timestamp)\r\n unvalidated_sub_model = get_sub_model_unvalidated(timestamp)\r\n\r\n assert sub_model == unvalidated_sub_model\r\n\r\n for _ in range(n_warmup_runs):\r\n get_sub_model(timestamp)\r\n get_sub_model_unvalidated(timestamp)\r\n\r\n with basic_profile(\"validated\"):\r\n for _ in range(n_runs):\r\n get_sub_model(timestamp)\r\n\r\n with basic_profile(\"unvalidated\"):\r\n for _ in range(n_runs):\r\n get_sub_model_unvalidated(timestamp)\r\n\r\n\r\nrun()\r\n```\r\nDataset Viewer
instance_id
stringlengths 10
57
| patch
stringlengths 261
37.7k
| repo
stringlengths 7
53
| base_commit
stringlengths 40
40
| hints_text
stringclasses 301
values | test_patch
stringlengths 212
2.22M
| problem_statement
stringlengths 23
37.7k
| version
stringclasses 1
value | environment_setup_commit
stringlengths 40
40
| FAIL_TO_PASS
sequencelengths 1
4.94k
| PASS_TO_PASS
sequencelengths 0
7.82k
| meta
dict | created_at
stringlengths 25
25
| license
stringclasses 8
values | __index_level_0__
int64 0
6.41k
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
0b01001001__spectree-64
|
diff --git a/setup.py b/setup.py
index 1b3cb64..4ef21e6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ with open(path.join(here, 'requirements.txt'), encoding='utf-8') as f:
setup(
name='spectree',
- version='0.3.7',
+ version='0.3.8',
author='Keming Yang',
author_email='kemingy94@gmail.com',
description=('generate OpenAPI document and validate request&response '
diff --git a/spectree/utils.py b/spectree/utils.py
index bb5698d..73d6c71 100644
--- a/spectree/utils.py
+++ b/spectree/utils.py
@@ -54,6 +54,7 @@ def parse_params(func, params, models):
'in': 'query',
'schema': schema,
'required': name in query.get('required', []),
+ 'description': schema.get('description', ''),
})
if hasattr(func, 'headers'):
@@ -64,6 +65,7 @@ def parse_params(func, params, models):
'in': 'header',
'schema': schema,
'required': name in headers.get('required', []),
+ 'description': schema.get('description', ''),
})
if hasattr(func, 'cookies'):
@@ -74,6 +76,7 @@ def parse_params(func, params, models):
'in': 'cookie',
'schema': schema,
'required': name in cookies.get('required', []),
+ 'description': schema.get('description', ''),
})
return params
|
0b01001001/spectree
|
a091fab020ac26548250c907bae0855273a98778
|
diff --git a/tests/common.py b/tests/common.py
index 0f2d696..83b4140 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -1,7 +1,7 @@
from enum import IntEnum, Enum
from typing import List
-from pydantic import BaseModel, root_validator
+from pydantic import BaseModel, root_validator, Field
class Order(IntEnum):
@@ -43,7 +43,7 @@ class Cookies(BaseModel):
class DemoModel(BaseModel):
uid: int
limit: int
- name: str
+ name: str = Field(..., description='user name')
def get_paths(spec):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index bf3426d..53dd3e1 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -98,8 +98,10 @@ def test_parse_params():
'name': 'uid',
'in': 'query',
'required': True,
+ 'description': '',
'schema': {
'title': 'Uid',
'type': 'integer',
}
}
+ assert params[2]['description'] == 'user name'
|
[BUG]description for query paramters can not show in swagger ui
Hi, when I add a description for a schema used in query, it can not show in swagger ui but can show in Redoc
```py
@HELLO.route('/', methods=['GET'])
@api.validate(query=HelloForm)
def hello():
"""
hello 注释
:return:
"""
return 'ok'
class HelloForm(BaseModel):
"""
hello表单
"""
user: str # 用户名称
msg: str = Field(description='msg test', example='aa')
index: int
data: HelloGetListForm
list: List[HelloListForm]
```
|
0.0
|
a091fab020ac26548250c907bae0855273a98778
|
[
"tests/test_utils.py::test_parse_params"
] |
[
"tests/test_utils.py::test_comments",
"tests/test_utils.py::test_parse_code",
"tests/test_utils.py::test_parse_name",
"tests/test_utils.py::test_has_model",
"tests/test_utils.py::test_parse_resp",
"tests/test_utils.py::test_parse_request"
] |
{
"failed_lite_validators": [
"has_hyperlinks",
"has_media",
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2020-10-12 13:21:50+00:00
|
apache-2.0
| 0 |
|
12rambau__sepal_ui-644
|
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 9fc498b3..fc69f702 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -72,17 +72,19 @@ jobs:
assert len(unexpected) == 0
- name: test with pytest
- run: coverage run -m pytest --color=yes --instafail tests
+ run: pytest --color=yes --cov --cov-report=xml --instafail tests
+
+ - name: assess dead fixtures
+ if: matrix.python-version == '3.8'
+ run: pytest --dead-fixtures
- name: build the template panel application
if: matrix.python-version == '3.8'
- run: |
- pytest --nbmake sepal_ui/templates/panel_app/ui.ipynb
+ run: pytest --nbmake sepal_ui/templates/panel_app/ui.ipynb
- name: build the template map application
if: matrix.python-version == '3.8'
- run: |
- pytest --nbmake sepal_ui/templates/map_app/ui.ipynb
+ run: pytest --nbmake sepal_ui/templates/map_app/ui.ipynb
- name: coverage
run: coverage xml
diff --git a/sepal_ui/sepalwidgets/btn.py b/sepal_ui/sepalwidgets/btn.py
index 137622fa..105f6160 100644
--- a/sepal_ui/sepalwidgets/btn.py
+++ b/sepal_ui/sepalwidgets/btn.py
@@ -25,6 +25,9 @@ class Btn(v.Btn, SepalWidget):
.. deprecated:: 2.13
``text`` and ``icon`` will be replaced by ``msg`` and ``gliph`` to avoid duplicating ipyvuetify trait.
+
+ .. deprecated:: 2.14
+ Btn is not using a default ``msg`` anymor`.
"""
v_icon = None
@@ -36,7 +39,7 @@ class Btn(v.Btn, SepalWidget):
msg = Unicode("").tag(sync=True)
"traitlet.Unicode: the text of the btn"
- def __init__(self, msg="Click", gliph="", **kwargs):
+ def __init__(self, msg="", gliph="", **kwargs):
# deprecation in 2.13 of text and icon
# as they already exist in the ipyvuetify Btn traits (as booleans)
@@ -55,7 +58,7 @@ class Btn(v.Btn, SepalWidget):
)
# create the default v_icon
- self.v_icon = v.Icon(left=True, children=[""])
+ self.v_icon = v.Icon(children=[""])
# set the default parameters
kwargs["color"] = kwargs.pop("color", "primary")
@@ -89,6 +92,7 @@ class Btn(v.Btn, SepalWidget):
Set the text of the btn
"""
+ self.v_icon.left = bool(change["new"])
self.children = [self.v_icon, change["new"]]
return self
diff --git a/setup.py b/setup.py
index 84775ae4..e7ca3ccf 100644
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@ setup_params = {
"cryptography",
"python-box",
"xyzservices",
- "planet==2.0a2", # this is a prerelease
+ "planet>=2.0",
"pyyaml",
"dask",
"tqdm",
@@ -83,6 +83,8 @@ setup_params = {
"pytest-sugar",
"pytest-icdiff",
"pytest-instafail",
+ "pytest-deadfixtures",
+ "pytest-cov",
"nbmake ",
],
"doc": [
|
12rambau/sepal_ui
|
8a8196e3c7893b7a0aebdb4910e83054f59e0374
|
diff --git a/tests/test_Btn.py b/tests/test_Btn.py
index fcaed760..4e3cb9b5 100644
--- a/tests/test_Btn.py
+++ b/tests/test_Btn.py
@@ -11,7 +11,7 @@ class TestBtn:
btn = sw.Btn()
assert btn.color == "primary"
assert btn.v_icon.children[0] == ""
- assert btn.children[1] == "Click"
+ assert btn.children[1] == ""
# extensive btn
btn = sw.Btn("toto", "fas fa-folder")
@@ -42,12 +42,18 @@ class TestBtn:
assert isinstance(btn.v_icon, v.Icon)
assert btn.v_icon.children[0] == gliph
+ assert btn.v_icon.left is True
# change existing icon
gliph = "fas fa-file"
btn.gliph = gliph
assert btn.v_icon.children[0] == gliph
+ # display only the gliph
+ btn.msg = ""
+ assert btn.children[1] == ""
+ assert btn.v_icon.left is False
+
# remove all gliph
gliph = ""
btn.gliph = gliph
@@ -79,4 +85,4 @@ class TestBtn:
def btn(self):
"""Create a simple btn"""
- return sw.Btn()
+ return sw.Btn("Click")
diff --git a/tests/test_PlanetModel.py b/tests/test_PlanetModel.py
index f84d2e1f..d6d63c5a 100644
--- a/tests/test_PlanetModel.py
+++ b/tests/test_PlanetModel.py
@@ -9,11 +9,17 @@ from sepal_ui.planetapi import PlanetModel
@pytest.mark.skipif("PLANET_API_KEY" not in os.environ, reason="requires Planet")
class TestPlanetModel:
- @pytest.mark.parametrize("credentials", ["planet_key", "cred"])
- def test_init(self, credentials, request):
+ def test_init(self, planet_key, cred, request):
+
+ # Test with a valid api key
+ planet_model = PlanetModel(planet_key)
+
+ assert isinstance(planet_model, PlanetModel)
+ assert isinstance(planet_model.session, planet.http.Session)
+ assert planet_model.active is True
- # Test with a valid api key and login credentials
- planet_model = PlanetModel(request.getfixturevalue(credentials))
+ # Test with a valid login credentials
+ planet_model = PlanetModel(cred)
assert isinstance(planet_model, PlanetModel)
assert isinstance(planet_model.session, planet.http.Session)
@@ -56,10 +62,7 @@ class TestPlanetModel:
return
- def test_is_active(self, planet_key):
-
- # We only need to test with a key.
- planet_model = PlanetModel(planet_key)
+ def test_is_active(self, planet_model):
planet_model._is_active()
assert planet_model.active is True
@@ -69,9 +72,8 @@ class TestPlanetModel:
return
- def test_get_subscriptions(self, planet_key):
+ def test_get_subscriptions(self, planet_model):
- planet_model = PlanetModel(planet_key)
subs = planet_model.get_subscriptions()
# Check object has length, because there is no way to check a value
@@ -80,10 +82,7 @@ class TestPlanetModel:
return
- def test_get_planet_items(self, planet_key):
-
- # Arrange
- planet_model = PlanetModel(planet_key)
+ def test_get_planet_items(self, planet_model):
aoi = { # Yasuni national park in Ecuador
"type": "Polygon",
@@ -119,3 +118,11 @@ class TestPlanetModel:
credentials = json.loads(os.getenv("PLANET_API_CREDENTIALS"))
return list(credentials.values())
+
+ @pytest.fixture
+ def planet_model(self):
+ """Start a planet model using the API key"""
+
+ key = os.getenv("PLANET_API_KEY")
+
+ return PlanetModel(key)
|
sepal_ui.Btn does't work as expected
I want to create a simple Icon button, to do so:
```python
sw.Btn(icon=True, gliph ="mdi-plus")
```
Doing this, without "msg" parameter will add the default text to the button which is "click", I think is worthless having that value.
So if I want to remove the default text, I would expect doing this:
```python
sw.Btn(children = [""], icon=True, gliph ="mdi-plus")
# or
sw.Btn(msg= ""] icon=True, gliph ="mdi-plus")
```
Which leads the icon aligned to the left and not centered (as it is using a empyt string as message).
|
0.0
|
8a8196e3c7893b7a0aebdb4910e83054f59e0374
|
[
"tests/test_Btn.py::TestBtn::test_init",
"tests/test_Btn.py::TestBtn::test_set_gliph"
] |
[
"tests/test_Btn.py::TestBtn::test_toggle_loading",
"tests/test_Btn.py::TestBtn::test_set_msg"
] |
{
"failed_lite_validators": [
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2022-11-29 14:42:21+00:00
|
mit
| 1 |
|
15five__scim2-filter-parser-13
|
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 12a5d4f..178f172 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,10 @@
CHANGE LOG
==========
+0.3.5
+-----
+- Update the sql.Transpiler to collect namedtuples rather than tuples for attr paths
+
0.3.4
-----
- Update tox.ini and clean up linting errors
diff --git a/setup.py b/setup.py
index bbf57bf..bd16f70 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ def long_description():
setup(
name='scim2-filter-parser',
- version='0.3.4',
+ version='0.3.5',
description='A customizable parser/transpiler for SCIM2.0 filters',
url='https://github.com/15five/scim2-filter-parser',
maintainer='Paul Logston',
diff --git a/src/scim2_filter_parser/transpilers/sql.py b/src/scim2_filter_parser/transpilers/sql.py
index 6254f1e..2107758 100644
--- a/src/scim2_filter_parser/transpilers/sql.py
+++ b/src/scim2_filter_parser/transpilers/sql.py
@@ -4,9 +4,12 @@ clause based on a SCIM filter.
"""
import ast
import string
+import collections
from .. import ast as scim2ast
+AttrPath = collections.namedtuple('AttrPath', ['attr_name', 'sub_attr', 'uri'])
+
class Transpiler(ast.NodeTransformer):
"""
@@ -145,7 +148,7 @@ class Transpiler(ast.NodeTransformer):
# Convert attr_name to another value based on map.
# Otherwise, return None.
- attr_path_tuple = (attr_name_value, sub_attr_value, uri_value)
+ attr_path_tuple = AttrPath(attr_name_value, sub_attr_value, uri_value)
self.attr_paths.append(attr_path_tuple)
return self.attr_map.get(attr_path_tuple)
|
15five/scim2-filter-parser
|
3ed1858b492542d0bc9b9e9ab9547641595e28c1
|
diff --git a/tests/test_transpiler.py b/tests/test_transpiler.py
index b8e1bb4..280c2d3 100644
--- a/tests/test_transpiler.py
+++ b/tests/test_transpiler.py
@@ -36,6 +36,16 @@ class RFCExamples(TestCase):
self.assertEqual(expected_sql, sql, query)
self.assertEqual(expected_params, params, query)
+ def test_attr_paths_are_created(self):
+ query = 'userName eq "bjensen"'
+ tokens = self.lexer.tokenize(query)
+ ast = self.parser.parse(tokens)
+ self.transpiler.transpile(ast)
+
+ self.assertEqual(len(self.transpiler.attr_paths), 1)
+ for path in self.transpiler.attr_paths:
+ self.assertTrue(isinstance(path, transpile_sql.AttrPath))
+
def test_username_eq(self):
query = 'userName eq "bjensen"'
sql = "username = {a}"
|
Return NamedTuple rather than tuple.
It would be nice to return a NamedTuple instead of a tuple here:
https://github.com/15five/scim2-filter-parser/blob/7ddc216f8c3dd1cdb2152944187e8f7f5ee07be2/src/scim2_filter_parser/transpilers/sql.py#L148
This way parts of each path could be accessed by name rather than by index in the tuple.
|
0.0
|
3ed1858b492542d0bc9b9e9ab9547641595e28c1
|
[
"tests/test_transpiler.py::RFCExamples::test_attr_paths_are_created"
] |
[
"tests/test_transpiler.py::CommandLine::test_command_line",
"tests/test_transpiler.py::AzureQueries::test_email_type_eq_primary_value_eq_uuid",
"tests/test_transpiler.py::AzureQueries::test_parse_simple_email_filter_with_uuid",
"tests/test_transpiler.py::AzureQueries::test_external_id_from_azure",
"tests/test_transpiler.py::UndefinedAttributes::test_schemas_eq",
"tests/test_transpiler.py::UndefinedAttributes::test_title_has_value_and_user_type_eq_1",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_1",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_2",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_2",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_1",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_email_contains_or_email_contains",
"tests/test_transpiler.py::UndefinedAttributes::test_email_type_eq_primary_value_eq_uuid_1",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_eq_and_not_email_type_eq_work_and_value_contains_3",
"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_3",
"tests/test_transpiler.py::UndefinedAttributes::test_email_type_eq_primary_value_eq_uuid_2",
"tests/test_transpiler.py::UndefinedAttributes::test_title_has_value_and_user_type_eq_2",
"tests/test_transpiler.py::UndefinedAttributes::test_user_type_ne_and_not_email_contains_or_email_contains",
"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_4",
"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_1",
"tests/test_transpiler.py::UndefinedAttributes::test_username_eq",
"tests/test_transpiler.py::UndefinedAttributes::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians_2",
"tests/test_transpiler.py::RFCExamples::test_username_eq",
"tests/test_transpiler.py::RFCExamples::test_schema_username_startswith",
"tests/test_transpiler.py::RFCExamples::test_title_has_value",
"tests/test_transpiler.py::RFCExamples::test_family_name_contains",
"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_lt",
"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_ge",
"tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_not_email_type_eq_work_and_value_contains",
"tests/test_transpiler.py::RFCExamples::test_emails_type_eq_work_value_contians_or_ims_type_eq_and_value_contians",
"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_le",
"tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_not_email_type_eq",
"tests/test_transpiler.py::RFCExamples::test_title_has_value_and_user_type_eq",
"tests/test_transpiler.py::RFCExamples::test_schemas_eq",
"tests/test_transpiler.py::RFCExamples::test_user_type_eq_and_email_contains_or_email_contains",
"tests/test_transpiler.py::RFCExamples::test_title_has_value_or_user_type_eq",
"tests/test_transpiler.py::RFCExamples::test_meta_last_modified_gt",
"tests/test_transpiler.py::RFCExamples::test_user_type_ne_and_not_email_contains_or_email_contains",
"tests/test_transpiler.py::RFCExamples::test_username_startswith"
] |
{
"failed_lite_validators": [
"has_short_problem_statement",
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2020-07-30 14:25:04+00:00
|
mit
| 2 |
|
15five__scim2-filter-parser-20
|
diff --git a/src/scim2_filter_parser/parser.py b/src/scim2_filter_parser/parser.py
index 516f65d..12c693e 100644
--- a/src/scim2_filter_parser/parser.py
+++ b/src/scim2_filter_parser/parser.py
@@ -110,9 +110,8 @@ class SCIMParser(Parser):
# which takes precedence over "or"
# 3. Attribute operators
precedence = (
- ('nonassoc', OR), # noqa F821
- ('nonassoc', AND), # noqa F821
- ('nonassoc', NOT), # noqa F821
+ ('left', OR, AND), # noqa F821
+ ('right', NOT), # noqa F821
)
# FILTER = attrExp / logExp / valuePath / *1"not" "(" FILTER ")"
|
15five/scim2-filter-parser
|
08de23c5626556a37beced764a22a2fa7021989b
|
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 4ff562c..19aa198 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -47,6 +47,24 @@ class BuggyQueries(TestCase):
with self.assertRaises(parser.SCIMParserError):
self.parser.parse(token_stream)
+ def test_g17_1_log_exp_order(self):
+ query = 'displayName co "username" or nickName co "username" or userName co "username"'
+
+ tokens = self.lexer.tokenize(query)
+ self.parser.parse(tokens) # Should not raise error
+
+ def test_g17_2_log_exp_order(self):
+ query = 'displayName co "username" and nickName co "username" and userName co "username"'
+
+ tokens = self.lexer.tokenize(query)
+ self.parser.parse(tokens) # Should not raise error
+
+ def test_g17_3_log_exp_order(self):
+ query = 'displayName co "username" and nickName co "username" or userName co "username"'
+
+ tokens = self.lexer.tokenize(query)
+ self.parser.parse(tokens) # Should not raise error
+
class CommandLine(TestCase):
def setUp(self):
|
Issue when using multiple "or" or "and"
Hi,
I am facing an issue, where the query having two or more "and" or more than two "or" is failing.
Have a look at examples below: -
1)```"displayName co \"username\" or nickName co \"username\" or userName co \"username\""```
```"displayName co \"username\" and nickName co \"username\" and userName co \"username\""```
the two queries fails giving ,
```scim2_filter_parser.parser.SCIMParserError: Parsing error at: Token(type='OR', value='or', lineno=1, index=52)```
notice above queries are having either only "or" or "and".
2)```"displayName co \"username\" and nickName co \"username\" or userName co \"username\""```
but this query works.
|
0.0
|
08de23c5626556a37beced764a22a2fa7021989b
|
[
"tests/test_parser.py::BuggyQueries::test_g17_2_log_exp_order",
"tests/test_parser.py::BuggyQueries::test_g17_1_log_exp_order"
] |
[
"tests/test_parser.py::BuggyQueries::test_g17_3_log_exp_order",
"tests/test_parser.py::BuggyQueries::test_no_quotes_around_comp_value",
"tests/test_parser.py::RegressionTestQueries::test_command_line",
"tests/test_parser.py::CommandLine::test_command_line"
] |
{
"failed_lite_validators": [
"has_pytest_match_arg"
],
"has_test_patch": true,
"is_lite": false
}
|
2020-10-18 03:21:13+00:00
|
mit
| 3 |
|
20c__ctl-3
|
diff --git a/src/ctl/plugins/pypi.py b/src/ctl/plugins/pypi.py
index 5d979af..a6117af 100644
--- a/src/ctl/plugins/pypi.py
+++ b/src/ctl/plugins/pypi.py
@@ -32,7 +32,7 @@ class PyPIPluginConfig(release.ReleasePluginConfig):
config_file = confu.schema.Str(help="path to pypi config file (e.g. ~/.pypirc)")
# PyPI repository name, needs to exist in your pypi config file
- repository = confu.schema.Str(
+ pypi_repository = confu.schema.Str(
help="PyPI repository name - needs to exist " "in your pypi config file",
default="pypi",
)
@@ -55,16 +55,16 @@ class PyPIPlugin(release.ReleasePlugin):
@property
def dist_path(self):
- return os.path.join(self.target.checkout_path, "dist", "*")
+ return os.path.join(self.repository.checkout_path, "dist", "*")
def prepare(self):
super(PyPIPlugin, self).prepare()
self.shell = True
- self.repository = self.get_config("repository")
+ self.pypi_repository = self.get_config("pypi_repository")
self.pypirc_path = os.path.expanduser(self.config.get("config_file"))
self.twine_settings = Settings(
config_file=self.pypirc_path,
- repository_name=self.repository,
+ repository_name=self.pypi_repository,
sign=self.get_config("sign"),
identity=self.get_config("identity"),
sign_with=self.get_config("sign_with"),
diff --git a/src/ctl/plugins/release.py b/src/ctl/plugins/release.py
index bcfa1ce..dcae2f4 100644
--- a/src/ctl/plugins/release.py
+++ b/src/ctl/plugins/release.py
@@ -18,8 +18,8 @@ import ctl.plugins.git
class ReleasePluginConfig(confu.schema.Schema):
- target = confu.schema.Str(
- help="target for release - should be a path "
+ repository = confu.schema.Str(
+ help="repository target for release - should be a path "
"to a python package or the name of a "
"repository type plugin",
cli=False,
@@ -46,16 +46,16 @@ class ReleasePlugin(command.CommandPlugin):
"version",
nargs=1,
type=str,
- help="release version - if target is managed by git, "
+ help="release version - if repository is managed by git, "
"checkout this branch/tag",
)
group.add_argument(
- "target",
+ "repository",
nargs="?",
type=str,
- default=plugin_config.get("target"),
- help=ReleasePluginConfig().target.help,
+ default=plugin_config.get("repository"),
+ help=ReleasePluginConfig().repository.help,
)
sub = parser.add_subparsers(title="Operation", dest="op")
@@ -74,7 +74,7 @@ class ReleasePlugin(command.CommandPlugin):
return {
"group": group,
- "confu_target": op_release_parser,
+ "confu_repository": op_release_parser,
"op_release_parser": op_release_parser,
"op_validate_parser": op_validate_parser,
}
@@ -84,48 +84,48 @@ class ReleasePlugin(command.CommandPlugin):
self.prepare()
self.shell = True
- self.set_target(self.get_config("target"))
+ self.set_repository(self.get_config("repository"))
self.dry_run = kwargs.get("dry")
self.version = kwargs.get("version")[0]
- self.orig_branch = self.target.branch
+ self.orig_branch = self.repository.branch
if self.dry_run:
self.log.info("Doing dry run...")
- self.log.info("Release target: {}".format(self.target))
+ self.log.info("Release repository: {}".format(self.repository))
try:
- self.target.checkout(self.version)
+ self.repository.checkout(self.version)
op = self.get_op(kwargs.get("op"))
op(**kwargs)
finally:
- self.target.checkout(self.orig_branch)
+ self.repository.checkout(self.orig_branch)
- def set_target(self, target):
- if not target:
- raise ValueError("No target specified")
+ def set_repository(self, repository):
+ if not repository:
+ raise ValueError("No repository specified")
try:
- self.target = self.other_plugin(target)
- if not isinstance(self.target, ctl.plugins.repository.RepositoryPlugin):
+ self.repository = self.other_plugin(repository)
+ if not isinstance(self.repository, ctl.plugins.repository.RepositoryPlugin):
raise TypeError(
"The plugin with the name `{}` is not a "
"repository type plugin and cannot be used "
- "as a target".format(target)
+ "as a repository".format(repository)
)
except KeyError:
- self.target = os.path.abspath(target)
- if not os.path.exists(self.target):
+ self.repository = os.path.abspath(repository)
+ if not os.path.exists(self.repository):
raise IOError(
"Target is neither a configured repository "
"plugin nor a valid file path: "
- "{}".format(self.target)
+ "{}".format(self.repository)
)
- self.target = ctl.plugins.git.temporary_plugin(
- self.ctl, "{}__tmp_repo".format(self.plugin_name), self.target
+ self.repository = ctl.plugins.git.temporary_plugin(
+ self.ctl, "{}__tmp_repo".format(self.plugin_name), self.repository
)
- self.cwd = self.target.checkout_path
+ self.cwd = self.repository.checkout_path
@expose("ctl.{plugin_name}.release")
def release(self, **kwargs):
|
20c/ctl
|
879af37647e61767a1ede59ffd353e4cfd27cd6f
|
diff --git a/tests/test_plugin_pypi.py b/tests/test_plugin_pypi.py
index 20315ad..19813e2 100644
--- a/tests/test_plugin_pypi.py
+++ b/tests/test_plugin_pypi.py
@@ -53,35 +53,35 @@ def test_init():
-def test_set_target_git_path(tmpdir, ctlr):
+def test_set_repository_git_path(tmpdir, ctlr):
"""
- Test setting build target: existing git repo via filepath
+ Test setting build repository: existing git repo via filepath
"""
plugin, git_plugin = instantiate(tmpdir, ctlr)
- plugin.set_target(git_plugin.checkout_path)
+ plugin.set_repository(git_plugin.checkout_path)
assert plugin.dist_path == os.path.join(git_plugin.checkout_path,
"dist", "*")
-def test_set_target_git_plugin(tmpdir, ctlr):
+def test_set_repository_git_plugin(tmpdir, ctlr):
"""
- Test setting build target: existing git plugin
+ Test setting build repository: existing git plugin
"""
plugin, git_plugin = instantiate(tmpdir, ctlr)
- plugin.set_target(git_plugin.plugin_name)
+ plugin.set_repository(git_plugin.plugin_name)
assert plugin.dist_path == os.path.join(git_plugin.checkout_path,
"dist", "*")
-def test_set_target_error(tmpdir, ctlr):
+def test_set_repository_error(tmpdir, ctlr):
"""
- Test setting invalid build target
+ Test setting invalid build repository
"""
plugin, git_plugin = instantiate(tmpdir, ctlr)
@@ -89,17 +89,17 @@ def test_set_target_error(tmpdir, ctlr):
# non existing path / plugin name
with pytest.raises(IOError):
- plugin.set_target("invalid target")
+ plugin.set_repository("invalid repository")
# invalid plugin type
with pytest.raises(TypeError):
- plugin.set_target("test_pypi")
+ plugin.set_repository("test_pypi")
- # no target
+ # no repository
with pytest.raises(ValueError):
- plugin.set_target(None)
+ plugin.set_repository(None)
def test_build_dist(tmpdir, ctlr):
@@ -110,7 +110,7 @@ def test_build_dist(tmpdir, ctlr):
plugin, git_plugin = instantiate(tmpdir, ctlr)
plugin.prepare()
- plugin.set_target(git_plugin.plugin_name)
+ plugin.set_repository(git_plugin.plugin_name)
plugin._build_dist()
assert os.path.exists(os.path.join(git_plugin.checkout_path,
@@ -126,7 +126,7 @@ def test_validate_dist(tmpdir, ctlr):
plugin, git_plugin = instantiate(tmpdir, ctlr)
plugin.prepare()
- plugin.set_target(git_plugin.plugin_name)
+ plugin.set_repository(git_plugin.plugin_name)
plugin._build_dist()
plugin._validate_dist()
|
PyPI plugin: `target` config attribute should be `repository`
This is so it's in line with the version plugin, which currently uses `repository` to specify the target repository
The pypi plugin currently uses `repository` to specify which PyPI repository to use, this should change to `pypi_repository` as well.
Should do this before tagging 1.0.0 since it's a config schema change
|
0.0
|
879af37647e61767a1ede59ffd353e4cfd27cd6f
|
[
"tests/test_plugin_pypi.py::test_set_repository_git_path[standard]",
"tests/test_plugin_pypi.py::test_set_repository_error[standard]",
"tests/test_plugin_pypi.py::test_set_repository_git_plugin[standard]"
] |
[
"tests/test_plugin_pypi.py::test_init"
] |
{
"failed_lite_validators": [
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2019-10-08 09:23:56+00:00
|
apache-2.0
| 4 |
|
20c__ctl-7
|
diff --git a/Ctl/Pipfile b/Ctl/Pipfile
index 0c7a304..1bd6308 100644
--- a/Ctl/Pipfile
+++ b/Ctl/Pipfile
@@ -14,7 +14,7 @@ tmpl = "==0.3.0"
[packages]
munge = "<1,>=0.4"
-cfu = ">=1.2.0,<2"
+cfu = ">=1.3.0,<2"
grainy = ">=1.4.0,<2"
git-url-parse = ">=1.1.0,<2"
pluginmgr = ">=0.6"
diff --git a/Ctl/requirements.txt b/Ctl/requirements.txt
index b3582c5..0037aaa 100644
--- a/Ctl/requirements.txt
+++ b/Ctl/requirements.txt
@@ -1,5 +1,5 @@
munge >=0.4, <1
-cfu >= 1.2.0, < 2
+cfu >= 1.3.0, < 2
grainy >= 1.4.0, <2
git-url-parse >= 1.1.0, <2
pluginmgr >= 0.6
diff --git a/src/ctl/__init__.py b/src/ctl/__init__.py
index eb4a635..b9616df 100644
--- a/src/ctl/__init__.py
+++ b/src/ctl/__init__.py
@@ -4,6 +4,7 @@ import os
from pkg_resources import get_distribution
import confu.config
+import confu.exceptions
import grainy.core
import copy
import logging
@@ -279,11 +280,14 @@ class Ctl(object):
# def set_config_dir(self):
def __init__(self, ctx=None, config_dir=None, full_init=True):
- self.init_context(ctx=ctx, config_dir=config_dir)
+ self.init_context(ctx=ctx, config_dir=config_dir)
self.init_logging()
- self.init_permissions()
+ if self.config.errors:
+ return self.log_config_issues()
+
+ self.init_permissions()
self.expose_plugin_vars()
if full_init:
@@ -330,8 +334,10 @@ class Ctl(object):
Apply python logging config and create `log` and `usage_log`
properties
"""
+
# allow setting up python logging from ctl config
set_pylogger_config(self.ctx.config.get_nested("ctl", "log"))
+
# instantiate logger
self.log = Log("ctl")
self.usage_log = Log("usage")
diff --git a/src/ctl/util/versioning.py b/src/ctl/util/versioning.py
index 22bdb09..23e1390 100644
--- a/src/ctl/util/versioning.py
+++ b/src/ctl/util/versioning.py
@@ -1,5 +1,4 @@
def version_tuple(version):
- print("VERSION", version)
""" Returns a tuple from version string """
return tuple(version.split("."))
@@ -9,27 +8,35 @@ def version_string(version):
return ".".join(["{}".format(v) for v in version])
-def validate_semantic(version):
+def validate_semantic(version, pad=0):
if not isinstance(version, (list, tuple)):
version = version_tuple(version)
- try:
- major, minor, patch, dev = version
- except ValueError:
- major, minor, patch = version
+ parts = len(version)
+
+ if parts < 1:
+ raise ValueError("Semantic version needs to contain at least a major version")
+ if parts > 4:
+ raise ValueError("Semantic version can not contain more than 4 parts")
+
+ if parts < pad:
+ version = tuple(list(version) + [0 for i in range(0, pad - parts)])
return tuple([int(n) for n in version])
def bump_semantic(version, segment):
- version = list(validate_semantic(version))
if segment == "major":
+ version = list(validate_semantic(version))
return (version[0] + 1, 0, 0)
elif segment == "minor":
+ version = list(validate_semantic(version, pad=2))
return (version[0], version[1] + 1, 0)
elif segment == "patch":
+ version = list(validate_semantic(version, pad=3))
return (version[0], version[1], version[2] + 1)
elif segment == "dev":
+ version = list(validate_semantic(version, pad=4))
try:
return (version[0], version[1], version[2], version[3] + 1)
except IndexError:
|
20c/ctl
|
be7f350f8f2d92918922d82fce0266fcd72decd2
|
diff --git a/tests/test_plugin_version.py b/tests/test_plugin_version.py
index 6745c78..4b9617a 100644
--- a/tests/test_plugin_version.py
+++ b/tests/test_plugin_version.py
@@ -138,6 +138,30 @@ def test_bump(tmpdir, ctlr):
plugin.bump(version="invalid", repo="dummy_repo")
+def test_bump_truncated(tmpdir, ctlr):
+ plugin, dummy_repo = instantiate(tmpdir, ctlr)
+ plugin.tag(version="1.0", repo="dummy_repo")
+
+ plugin.bump(version="minor", repo="dummy_repo")
+ assert dummy_repo.version == ("1", "1", "0")
+ assert dummy_repo._tag == "1.1.0"
+
+ plugin.tag(version="1.0", repo="dummy_repo")
+ plugin.bump(version="patch", repo="dummy_repo")
+ assert dummy_repo.version == ("1", "0", "1")
+ assert dummy_repo._tag == "1.0.1"
+
+ plugin.tag(version="2", repo="dummy_repo")
+ plugin.bump(version="patch", repo="dummy_repo")
+ assert dummy_repo.version == ("2", "0", "1")
+ assert dummy_repo._tag == "2.0.1"
+
+ plugin.tag(version="3", repo="dummy_repo")
+ plugin.bump(version="major", repo="dummy_repo")
+ assert dummy_repo.version == ("4", "0", "0")
+ assert dummy_repo._tag == "4.0.0"
+
+
def test_execute(tmpdir, ctlr):
plugin, dummy_repo = instantiate(tmpdir, ctlr)
plugin.execute(op="tag", version="1.0.0", repository="dummy_repo", init=True)
diff --git a/tests/test_util_versioning.py b/tests/test_util_versioning.py
index b89df79..6624816 100644
--- a/tests/test_util_versioning.py
+++ b/tests/test_util_versioning.py
@@ -19,7 +19,7 @@ def test_version_tuple(version, string):
((1, 0, 0), (1, 0, 0), None),
("1.0.0.0", (1, 0, 0, 0), None),
((1, 0, 0, 0), (1, 0, 0, 0), None),
- ("1.0", None, ValueError),
+ ("1.0", (1, 0), None),
("a.b.c", None, ValueError),
],
)
|
Better error handling for config errors outside of `plugins`
Example: having a schema error in `permissions` exits ctl with traceback that's not very telling as to what is failing
reproduce:
```
permissions:
namespace: ctl
permission: crud
```
|
0.0
|
be7f350f8f2d92918922d82fce0266fcd72decd2
|
[
"tests/test_util_versioning.py::test_validate_semantic[1.0-expected4-None]",
"tests/test_plugin_version.py::test_bump_truncated[standard]"
] |
[
"tests/test_util_versioning.py::test_bump_semantic[1.2.3-minor-expected1]",
"tests/test_util_versioning.py::test_validate_semantic[1.0.0-expected0-None]",
"tests/test_util_versioning.py::test_validate_semantic[version3-expected3-None]",
"tests/test_util_versioning.py::test_validate_semantic[version1-expected1-None]",
"tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-dev-expected3]",
"tests/test_util_versioning.py::test_version_tuple[version0-1.0.0]",
"tests/test_util_versioning.py::test_validate_semantic[1.0.0.0-expected2-None]",
"tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-patch-expected2]",
"tests/test_util_versioning.py::test_bump_semantic[1.2.3.4-major-expected0]",
"tests/test_util_versioning.py::test_validate_semantic[a.b.c-None-ValueError]",
"tests/test_plugin_version.py::test_execute_permissions[permission_denied]",
"tests/test_plugin_version.py::test_tag[standard]",
"tests/test_plugin_version.py::test_repository[standard]",
"tests/test_plugin_version.py::test_bump[standard]",
"tests/test_plugin_version.py::test_execute[standard]",
"tests/test_plugin_version.py::test_init"
] |
{
"failed_lite_validators": [
"has_short_problem_statement",
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2019-10-21 11:05:40+00:00
|
apache-2.0
| 5 |
|
3YOURMIND__django-migration-linter-186
|
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 085b32c..fef9e0e 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
- python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9']
+ python-version: ['3.6', '3.7', '3.8', '3.9']
name: Build with Python ${{ matrix.python-version }}
steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ec8e5..15fefc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
-## 4.0.0
+## 4.0.0 (unreleased)
- Drop support for Python 2.7 and 3.5
- Drop support for Django 1.11, 2.0, 2.1, 3.0
+- Fix index creation detection when table is being created in the transaction (issue #178)
## 3.0.1
diff --git a/django_migration_linter/sql_analyser/postgresql.py b/django_migration_linter/sql_analyser/postgresql.py
index 140aba3..3eb18a5 100644
--- a/django_migration_linter/sql_analyser/postgresql.py
+++ b/django_migration_linter/sql_analyser/postgresql.py
@@ -3,14 +3,32 @@ import re
from .base import BaseAnalyser
+def has_create_index(sql_statements, **kwargs):
+ regex_result = None
+ for sql in sql_statements:
+ regex_result = re.search(r"CREATE (UNIQUE )?INDEX.*ON (.*) \(", sql)
+ if re.search("INDEX CONCURRENTLY", sql):
+ regex_result = None
+ elif regex_result:
+ break
+ if not regex_result:
+ return False
+
+ concerned_table = regex_result.group(2)
+ table_is_added_in_transaction = any(
+ sql.startswith("CREATE TABLE {}".format(concerned_table))
+ for sql in sql_statements
+ )
+ return not table_is_added_in_transaction
+
+
class PostgresqlAnalyser(BaseAnalyser):
migration_tests = [
{
"code": "CREATE_INDEX",
- "fn": lambda sql, **kw: re.search("CREATE (UNIQUE )?INDEX", sql)
- and not re.search("INDEX CONCURRENTLY", sql),
+ "fn": has_create_index,
"msg": "CREATE INDEX locks table",
- "mode": "one_liner",
+ "mode": "transaction",
"type": "warning",
},
{
|
3YOURMIND/django-migration-linter
|
aef3db3e4198d06c38bc4b0874e72ed657891eea
|
diff --git a/tests/unit/test_sql_analyser.py b/tests/unit/test_sql_analyser.py
index 00dd50e..65ab7f0 100644
--- a/tests/unit/test_sql_analyser.py
+++ b/tests/unit/test_sql_analyser.py
@@ -233,6 +233,23 @@ class PostgresqlAnalyserTestCase(SqlAnalyserTestCase):
sql = "CREATE UNIQUE INDEX title_idx ON films (title);"
self.assertWarningSql(sql)
+ def test_create_index_non_concurrently_with_table_creation(self):
+ sql = [
+ 'CREATE TABLE "films" ("title" text);',
+ 'CREATE INDEX ON "films" ((lower("title")));',
+ ]
+ self.assertValidSql(sql)
+ sql = [
+ 'CREATE TABLE "some_table" ("title" text);',
+ 'CREATE INDEX ON "films" ((lower("title")));',
+ ]
+ self.assertWarningSql(sql)
+ sql = [
+ 'CREATE TABLE "films" ("title" text);',
+ 'CREATE INDEX ON "some_table" ((lower("title")));',
+ ]
+ self.assertWarningSql(sql)
+
def test_create_index_concurrently(self):
sql = "CREATE INDEX CONCURRENTLY ON films (lower(title));"
self.assertValidSql(sql)
|
Linter fails on CREATE INDEX when creating a new table
Here is an example `CreateModel` from Django:
```python
migrations.CreateModel(
name='ShipmentMetadataAlert',
fields=[
('deleted_at', models.DateTimeField(blank=True, db_index=True, null=True)),
('created_at', common.fields.CreatedField(default=django.utils.timezone.now, editable=False)),
('updated_at', common.fields.LastModifiedField(default=django.utils.timezone.now, editable=False)),
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='ID')),
('message', models.TextField(blank=True, null=True)),
('level', models.CharField(blank=True, choices=[('HIGH', 'high'), ('MEDIUM', 'medium'), ('LOW', 'low')], max_length=16, null=True)),
('type', models.CharField(blank=True, choices=[('MOBILE_DEVICE_ALERT', 'MOBILE_DEVICE_ALERT'), ('NON_ACTIVE_CARRIER', 'NON_ACTIVE_CARRIER'), ('OTHER', 'OTHER')], max_length=32, null=True)),
('subtype', models.CharField(blank=True, choices=[('DRIVER_PERMISSIONS', 'DRIVER_PERMISSIONS'), ('DRIVER_LOCATION', 'DRIVER_LOCATION'), ('OTHER', 'OTHER')], max_length=32, null=True)),
('occurred_at', models.DateTimeField(null=True)),
('clear_alert_job_id', models.UUIDField(default=None, null=True)),
('metadata', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='alerts', to='shipments.ShipmentMetadata')),
],
options={
'abstract': False,
}
)
```
Here are the SQL statements that this spits out in `sqlmigrate`:
```sql
BEGIN;
--
-- Create model ShipmentMetadataAlert
--
CREATE TABLE "shipments_shipmentmetadataalert" ("deleted_at" timestamp with time zone NULL, "created_at" timestamp with time zone NOT NULL, "updated_at" timestamp with time zone NOT NULL, "id" uuid NOT NULL PRIMARY KEY, "message" text NULL, "level" varchar(16) NULL, "type" varchar(32) NULL, "subtype" varchar(32) NULL, "occurred_at" timestamp with time zone NULL, "clear_alert_job_id" uuid NULL, "metadata_id" uuid NOT NULL);
ALTER TABLE "shipments_shipmentmetadataalert" ADD CONSTRAINT "shipments_shipmentme_metadata_id_f20850e8_fk_shipments" FOREIGN KEY ("metadata_id") REFERENCES "shipments_shipmentmetadata" ("id") DEFERRABLE INITIALLY DEFERRED;
CREATE INDEX "shipments_shipmentmetadataalert_deleted_at_c9a93342" ON "shipments_shipmentmetadataalert" ("deleted_at");
CREATE INDEX "shipments_shipmentmetadataalert_metadata_id_f20850e8" ON "shipments_shipmentmetadataalert" ("metadata_id");
COMMIT;
```
This is an error from the linter as it outputs the error `CREATE INDEX locks table`. But the table is being created within the migration, it just needs to recognize that.
It seems like the `CREATE INDEX` detection should work the same way that the `ADD_UNIQUE` detection works where it detects that the create table is happening in the same migration:
https://github.com/3YOURMIND/django-migration-linter/blob/db71a9db23746f64d41d681f3fecb9b066c87338/django_migration_linter/sql_analyser/base.py#L26-L40
|
0.0
|
aef3db3e4198d06c38bc4b0874e72ed657891eea
|
[
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently_with_table_creation"
] |
[
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_many_to_many_field",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null_followed_by_default",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_alter_column",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_drop_not_null",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_django_default",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_lib_default",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_unique_together",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_many_to_many_field",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_not_null",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column_after_django22",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_create_table_with_not_null",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_drop_not_null",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_rename_table",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_unique_together",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_add_many_to_many_field",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_alter_column",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_non_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_not_null",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_field_to_not_null_with_dropped_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_django_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_lib_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_not_null_followed_by_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_onetoonefield_to_not_null",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_reindex",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_unique_together"
] |
{
"failed_lite_validators": [
"has_many_modified_files"
],
"has_test_patch": true,
"is_lite": false
}
|
2021-12-20 21:27:38+00:00
|
apache-2.0
| 6 |
|
3YOURMIND__django-migration-linter-258
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3069d91..beafd65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,21 @@
Instead, the linter crashes and lets the `sqlmigrate` error raise, in order to avoid letting a problematic migration pass.
One common reason for such an error is the SQL generation which requires the database to be actually migrated in order to fetch actual constraint names from it.
The crash is a sign to double-check the migration. But if you are certain the migration is safe, you can ignore it (issue #209)
+
+Features:
+
- Fixed `RunPython` model import check when using a `through` object like `MyModel.many_to_many.through.objects.filter(...)` (issue #218)
- Mark the `IgnoreMigration` operation as `elidable=True`
+
+Bug:
+
+- Don't detect not nullable field on partial index creation (issue #250)
+
+Miscellaneous:
+
- Add support for Python 3.11
- Add support for Django 4.1
+- Add support for Django 4.2
- Drop support for Django 2.2
- Internally rename "migration tests" to "migration checks"
- Add dataclasses internally instead of custom dicts
diff --git a/django_migration_linter/sql_analyser/base.py b/django_migration_linter/sql_analyser/base.py
index 2fa0646..131652e 100644
--- a/django_migration_linter/sql_analyser/base.py
+++ b/django_migration_linter/sql_analyser/base.py
@@ -40,7 +40,8 @@ def has_not_null_column(sql_statements: list[str], **kwargs) -> bool:
ends_with_default = False
return (
any(
- re.search("(?<!DROP )NOT NULL", sql) and not sql.startswith("CREATE TABLE")
+ re.search("(?<!DROP )NOT NULL", sql)
+ and not (sql.startswith("CREATE TABLE") or sql.startswith("CREATE INDEX"))
for sql in sql_statements
)
and ends_with_default is False
|
3YOURMIND/django-migration-linter
|
366d16b01a72d0baa54fef55761d846b0f05b8dd
|
diff --git a/tests/unit/test_sql_analyser.py b/tests/unit/test_sql_analyser.py
index d7349fc..012d53c 100644
--- a/tests/unit/test_sql_analyser.py
+++ b/tests/unit/test_sql_analyser.py
@@ -297,6 +297,10 @@ class PostgresqlAnalyserTestCase(SqlAnalyserTestCase):
sql = "CREATE UNIQUE INDEX CONCURRENTLY title_idx ON films (title);"
self.assertValidSql(sql)
+ def test_create_index_concurrently_where(self):
+ sql = 'CREATE INDEX CONCURRENTLY "index_name" ON "table_name" ("a_column") WHERE ("some_column" IS NOT NULL);'
+ self.assertValidSql(sql)
+
def test_drop_index_non_concurrently(self):
sql = "DROP INDEX ON films"
self.assertWarningSql(sql)
|
Adding an index with a NOT NULL condition incorrectly triggers NOT_NULL rule
Adding an index with a `WHERE` clause including `NOT NULL` gets flagged as a `NOT NULL constraint on columns` error.
## Steps to reproduce
The follow migration operation:
```python
AddIndexConcurrently(
model_name="prediction",
index=models.Index(
condition=models.Q(
("data_deleted_at__isnull", True),
("delete_data_after__isnull", False),
),
fields=["delete_data_after"],
name="delete_data_after_idx",
),
),
```
Generates the following SQL:
```sql
CREATE INDEX CONCURRENTLY "delete_data_after_idx" ON "models_prediction" ("delete_data_after") WHERE ("data_deleted_at" IS NULL AND "delete_data_after" IS NOT NULL);
```
When linted this is flagged as an error because of the `NOT NULL`, when it ought to be a safe operation.
## Investigation
Looking at the condition used for this rule, I think it might just need to permit `CREATE INDEX` requests:
```python
re.search("(?<!DROP )NOT NULL", sql) and not sql.startswith("CREATE TABLE") and not sql.startswith("CREATE INDEX")
```
https://github.com/3YOURMIND/django-migration-linter/blob/202a6d9d5dea83528cb52fd7481a5a0565cc6f83/django_migration_linter/sql_analyser/base.py#L43
|
0.0
|
366d16b01a72d0baa54fef55761d846b0f05b8dd
|
[
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_concurrently_where"
] |
[
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_many_to_many_field",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_add_not_null_followed_by_default",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_alter_column",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_drop_not_null",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_django_default",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_make_column_not_null_with_lib_default",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_unique_index",
"tests/unit/test_sql_analyser.py::MySqlAnalyserTestCase::test_unique_together",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_many_to_many_field",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_add_not_null",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_alter_column_after_django22",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_create_table_with_not_null",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_drop_not_null",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_rename_table",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_unique_index",
"tests/unit/test_sql_analyser.py::SqliteAnalyserTestCase::test_unique_together",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_add_many_to_many_field",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_alter_column",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_create_index_non_concurrently_with_table_creation",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_index_non_concurrently",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_drop_not_null",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_field_to_not_null_with_dropped_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_django_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_make_column_not_null_with_lib_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_not_null_followed_by_default",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_onetoonefield_to_not_null",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_reindex",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_unique_index",
"tests/unit/test_sql_analyser.py::PostgresqlAnalyserTestCase::test_unique_together",
"tests/unit/test_sql_analyser.py::SqlUtilsTestCase::test_unknown_analyser_string",
"tests/unit/test_sql_analyser.py::SqlUtilsTestCase::test_unsupported_db_vendor"
] |
{
"failed_lite_validators": [
"has_many_modified_files"
],
"has_test_patch": true,
"is_lite": false
}
|
2023-07-03 18:35:18+00:00
|
apache-2.0
| 7 |
|
3YOURMIND__django-migration-linter-47
|
diff --git a/django_migration_linter/migration_linter.py b/django_migration_linter/migration_linter.py
index f9c0ab1..03c2054 100644
--- a/django_migration_linter/migration_linter.py
+++ b/django_migration_linter/migration_linter.py
@@ -20,7 +20,7 @@ from subprocess import Popen, PIPE
import sys
from .cache import Cache
-from .constants import DEFAULT_CACHE_PATH, MIGRATION_FOLDER_NAME
+from .constants import DEFAULT_CACHE_PATH, MIGRATION_FOLDER_NAME, __version__
from .migration import Migration
from .utils import is_directory, is_django_project, clean_bytes_to_str
from .sql_analyser import analyse_sql_statements
@@ -287,6 +287,9 @@ def _main():
action="https://huggingface.co/datasets/nebius/store_true",
help="print more information during execution",
)
+ parser.add_argument(
+ "--version", "-V", action="https://huggingface.co/datasets/nebius/version", version="%(prog)s {}".format(__version__)
+ )
parser.add_argument(
"--database",
type=str,
|
3YOURMIND/django-migration-linter
|
fbf0f4419336fcb1235fa57f5575ad2593354e44
|
diff --git a/tests/functional/test_cmd_line_call.py b/tests/functional/test_cmd_line_call.py
index a2861fa..47d7944 100644
--- a/tests/functional/test_cmd_line_call.py
+++ b/tests/functional/test_cmd_line_call.py
@@ -16,7 +16,7 @@ import os
import shutil
import unittest
from subprocess import Popen, PIPE
-from django_migration_linter import utils, DEFAULT_CACHE_PATH
+from django_migration_linter import utils, DEFAULT_CACHE_PATH, constants
from tests import fixtures
import sys
@@ -274,3 +274,25 @@ class CallLinterFromCommandLineTest(unittest.TestCase):
self.assertTrue(lines[0].endswith('ERR'))
self.assertTrue(lines[2].endswith('OK'))
self.assertTrue(lines[3].startswith('*** Summary'))
+
+
+class VersionOptionLinterFromCommandLineTest(CallLinterFromCommandLineTest):
+ def test_call_with_version_option(self):
+ cmd = "{} --version".format(self.linter_exec)
+ process = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
+ process.wait()
+ self.assertEqual(process.returncode, 0)
+ process_read_stream = process.stderr if sys.version_info.major == 2 else process.stdout
+ lines = list(map(utils.clean_bytes_to_str, process_read_stream.readlines()))
+ self.assertEqual(len(lines), 1)
+ self.assertEqual(lines[0], "django-migration-linter {}".format(constants.__version__))
+
+ def test_call_with_short_version_option(self):
+ cmd = "{} -V".format(self.linter_exec)
+ process = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
+ process.wait()
+ self.assertEqual(process.returncode, 0)
+ process_read_stream = process.stderr if sys.version_info.major == 2 else process.stdout
+ lines = list(map(utils.clean_bytes_to_str, process_read_stream.readlines()))
+ self.assertEqual(len(lines), 1)
+ self.assertEqual(lines[0], "django-migration-linter {}".format(constants.__version__))
|
Add --version option
Pretty straightforward. Have a `--version` that prints the current version of the linter.
|
0.0
|
fbf0f4419336fcb1235fa57f5575ad2593354e44
|
[
"tests/functional/test_cmd_line_call.py::VersionOptionLinterFromCommandLineTest::test_call_with_version_option",
"tests/functional/test_cmd_line_call.py::VersionOptionLinterFromCommandLineTest::test_call_with_short_version_option"
] |
[
"tests/functional/test_cmd_line_call.py::VersionOptionLinterFromCommandLineTest::test_call_linter_cmd_line_cache",
"tests/functional/test_cmd_line_call.py::CallLinterFromCommandLineTest::test_call_linter_cmd_line_cache"
] |
{
"failed_lite_validators": [
"has_short_problem_statement"
],
"has_test_patch": true,
"is_lite": false
}
|
2019-01-21 21:29:34+00:00
|
apache-2.0
| 8 |
|
4degrees__clique-26
|
diff --git a/source/clique/collection.py b/source/clique/collection.py
index 0c3b296..db9276c 100644
--- a/source/clique/collection.py
+++ b/source/clique/collection.py
@@ -251,15 +251,25 @@ class Collection(object):
else:
data['padding'] = '%d'
- if self.indexes:
+ if '{holes}' in pattern:
data['holes'] = self.holes().format('{ranges}')
+ if '{range}' in pattern or '{ranges}' in pattern:
indexes = list(self.indexes)
- if len(indexes) == 1:
+ indexes_count = len(indexes)
+
+ if indexes_count == 0:
+ data['range'] = ''
+
+ elif indexes_count == 1:
data['range'] = '{0}'.format(indexes[0])
+
else:
- data['range'] = '{0}-{1}'.format(indexes[0], indexes[-1])
+ data['range'] = '{0}-{1}'.format(
+ indexes[0], indexes[-1]
+ )
+ if '{ranges}' in pattern:
separated = self.separate()
if len(separated) > 1:
ranges = [collection.format('{range}')
@@ -270,11 +280,6 @@ class Collection(object):
data['ranges'] = ', '.join(ranges)
- else:
- data['holes'] = ''
- data['range'] = ''
- data['ranges'] = ''
-
return pattern.format(**data)
def is_contiguous(self):
|
4degrees/clique
|
a89507304acce5931f940c34025a6547fa8227b5
|
diff --git a/test/unit/test_collection.py b/test/unit/test_collection.py
index ce4daa7..11cb01e 100644
--- a/test/unit/test_collection.py
+++ b/test/unit/test_collection.py
@@ -2,6 +2,7 @@
# :copyright: Copyright (c) 2013 Martin Pengelly-Phillips
# :license: See LICENSE.txt.
+import sys
import inspect
import pytest
@@ -242,7 +243,6 @@ def test_remove_non_member():
(PaddedCollection, '{range}', '1-12'),
(PaddedCollection, '{ranges}', '1-3, 7, 9-12'),
(PaddedCollection, '{holes}', '4-6, 8'),
-
])
def test_format(CollectionCls, pattern, expected):
'''Format collection according to pattern.'''
@@ -250,6 +250,25 @@ def test_format(CollectionCls, pattern, expected):
assert collection.format(pattern) == expected
+def test_format_sparse_collection():
+ '''Format sparse collection without recursion error.'''
+ recursion_limit = sys.getrecursionlimit()
+ recursion_error_occurred = False
+
+ try:
+ collection = PaddedCollection(
+ indexes=set(range(0, recursion_limit * 2, 2))
+ )
+ collection.format()
+ except RuntimeError as error:
+ if 'maximum recursion depth exceeded' in str(error):
+ recursion_error_occurred = True
+ else:
+ raise
+
+ assert not recursion_error_occurred
+
+
@pytest.mark.parametrize(('collection', 'expected'), [
(PaddedCollection(indexes=set([])), True),
(PaddedCollection(indexes=set([1])), True),
|
collection.format hits maximum recursion depth for collections with lots of holes.
The following code gives an example.
```python
paths = ["name.{0:04d}.jpg".format(x) for x in range(2000)[::2]]
collection = clique.assemble(paths)[0][0]
collection.format("{head}####{tail}")
```
|
0.0
|
a89507304acce5931f940c34025a6547fa8227b5
|
[
"test/unit/test_collection.py::test_format_sparse_collection"
] |
[
"test/unit/test_collection.py::test_remove_non_member",
"test/unit/test_collection.py::test_separate[non-contiguous",
"test/unit/test_collection.py::test_is_compatible[incompatible",
"test/unit/test_collection.py::test_compatible_merge[complimentary]",
"test/unit/test_collection.py::test_holes[range",
"test/unit/test_collection.py::test_comparisons[different",
"test/unit/test_collection.py::test_format[PaddedCollection-{ranges}-1-3,",
"test/unit/test_collection.py::test_is_compatible[compatible]",
"test/unit/test_collection.py::test_holes[empty]",
"test/unit/test_collection.py::test_contains[non-member",
"test/unit/test_collection.py::test_compatible_merge[duplicates]",
"test/unit/test_collection.py::test_is_contiguous[empty]",
"test/unit/test_collection.py::test_match[padded-collection:unpadded",
"test/unit/test_collection.py::test_add[unpadded-collection:padded",
"test/unit/test_collection.py::test_add[padded-collection:unpadded",
"test/unit/test_collection.py::test_format[PaddedCollection-{head}-/head.]",
"test/unit/test_collection.py::test_holes[single",
"test/unit/test_collection.py::test_add[padded-collection:padded",
"test/unit/test_collection.py::test_is_contiguous[contiguous",
"test/unit/test_collection.py::test_not_implemented_comparison",
"test/unit/test_collection.py::test_format[PaddedCollection-{range}-1-12]",
"test/unit/test_collection.py::test_format[PaddedCollection-{padding}-%04d]",
"test/unit/test_collection.py::test_format[PaddedCollection-{holes}-4-6,",
"test/unit/test_collection.py::test_is_contiguous[single]",
"test/unit/test_collection.py::test_compatible_merge[both",
"test/unit/test_collection.py::test_match[different",
"test/unit/test_collection.py::test_str",
"test/unit/test_collection.py::test_unsettable_indexes",
"test/unit/test_collection.py::test_format[UnpaddedCollection-{padding}-%d]",
"test/unit/test_collection.py::test_contains[different",
"test/unit/test_collection.py::test_incompatible_merge[incompatible",
"test/unit/test_collection.py::test_format[PaddedCollection-{tail}-.ext]",
"test/unit/test_collection.py::test_separate[empty]",
"test/unit/test_collection.py::test_add[unpadded-collection:unpadded",
"test/unit/test_collection.py::test_repr",
"test/unit/test_collection.py::test_match[padded-collection:padded",
"test/unit/test_collection.py::test_change_property[padding-4-^head\\\\.(?P<index>(?P<padding>0*)\\\\d+?)\\\\.tail$-head.0001.tail]",
"test/unit/test_collection.py::test_iterator[padded-collection]",
"test/unit/test_collection.py::test_comparisons[equal]",
"test/unit/test_collection.py::test_iterator[unpadded-collection]",
"test/unit/test_collection.py::test_escaping_expression",
"test/unit/test_collection.py::test_match[unpadded-collection:unpadded",
"test/unit/test_collection.py::test_separate[single",
"test/unit/test_collection.py::test_holes[multiple",
"test/unit/test_collection.py::test_remove",
"test/unit/test_collection.py::test_holes[contiguous",
"test/unit/test_collection.py::test_holes[missing",
"test/unit/test_collection.py::test_match[unpadded-collection:padded",
"test/unit/test_collection.py::test_add_duplicate",
"test/unit/test_collection.py::test_is_contiguous[non-contiguous]",
"test/unit/test_collection.py::test_contains[valid",
"test/unit/test_collection.py::test_separate[contiguous"
] |
{
"failed_lite_validators": [
"has_short_problem_statement"
],
"has_test_patch": true,
"is_lite": false
}
|
2016-04-30 17:21:04+00:00
|
apache-2.0
| 9 |
|
6si__shipwright-79
|
diff --git a/CHANGES.rst b/CHANGES.rst
index f034d37..89cf5f1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,8 @@
0.5.1 (unreleased)
------------------
-- Nothing changed yet.
+- Add --pull-cache to pull images from repository before building.
+ (`Issue #49 <https://github.com/6si/shipwright/issues/49>`_).
0.5.0 (2016-08-19)
diff --git a/shipwright/base.py b/shipwright/base.py
index 213d597..421f1af 100644
--- a/shipwright/base.py
+++ b/shipwright/base.py
@@ -4,10 +4,11 @@ from . import build, dependencies, docker, push
class Shipwright(object):
- def __init__(self, source_control, docker_client, tags):
+ def __init__(self, source_control, docker_client, tags, pull_cache=False):
self.source_control = source_control
self.docker_client = docker_client
self.tags = tags
+ self._pull_cache = pull_cache
def targets(self):
return self.source_control.targets()
@@ -18,7 +19,10 @@ class Shipwright(object):
return self._build(this_ref_str, targets)
def _build(self, this_ref_str, targets):
- for evt in build.do_build(self.docker_client, this_ref_str, targets):
+ client = self.docker_client
+ pull_cache = self._pull_cache
+ ref = this_ref_str
+ for evt in build.do_build(client, ref, targets, pull_cache):
yield evt
# now that we're built and tagged all the images.
diff --git a/shipwright/build.py b/shipwright/build.py
index 707d4f9..4ee1558 100644
--- a/shipwright/build.py
+++ b/shipwright/build.py
@@ -13,7 +13,7 @@ def _merge(d1, d2):
return d
-def do_build(client, build_ref, targets):
+def do_build(client, build_ref, targets, pull_cache):
"""
Generic function for building multiple images while
notifying a callback function with output produced.
@@ -39,11 +39,11 @@ def do_build(client, build_ref, targets):
parent_ref = None
if target.parent:
parent_ref = build_index.get(target.parent)
- for evt in build(client, parent_ref, target):
+ for evt in build(client, parent_ref, target, pull_cache):
yield evt
-def build(client, parent_ref, image):
+def build(client, parent_ref, image, pull_cache):
"""
builds the given image tagged with <build_ref> and ensures that
it depends on it's parent if it's part of this build group (shares
@@ -62,7 +62,25 @@ def build(client, parent_ref, image):
built_tags = docker.last_built_from_docker(client, image.name)
if image.ref in built_tags:
- return []
+ return
+
+ if pull_cache:
+ pull_evts = client.pull(
+ repository=image.name,
+ tag=image.ref,
+ stream=True,
+ )
+
+ failed = False
+ for evt in pull_evts:
+ event = process_event_(evt)
+ if 'error' in event:
+ failed = True
+ else:
+ yield event
+
+ if not failed:
+ return
build_evts = client.build(
fileobj=mkcontext(parent_ref, image.path),
@@ -73,4 +91,5 @@ def build(client, parent_ref, image):
dockerfile=os.path.basename(image.path),
)
- return (process_event_(evt) for evt in build_evts)
+ for evt in build_evts:
+ yield process_event_(evt)
diff --git a/shipwright/cli.py b/shipwright/cli.py
index 24f6f78..82eaf50 100644
--- a/shipwright/cli.py
+++ b/shipwright/cli.py
@@ -109,6 +109,11 @@ def argparser():
help='Build working tree, including uncommited and untracked changes',
action="https://huggingface.co/datasets/nebius/store_true",
)
+ common.add_argument(
+ '--pull-cache',
+ help='When building try to pull previously built images',
+ action="https://huggingface.co/datasets/nebius/store_true",
+ )
a_arg(
common, '-d', '--dependants',
help='Build DEPENDANTS and all its dependants',
@@ -157,7 +162,6 @@ def old_style_arg_dict(namespace):
'--exclude': _flatten(ns.exclude),
'--help': False,
'--no-build': getattr(ns, 'no_build', False),
- '--dirty': getattr(ns, 'dirty', False),
'--upto': _flatten(ns.upto),
'--x-assert-hostname': ns.x_assert_hostname,
'-H': ns.docker_host,
@@ -237,8 +241,10 @@ def run(path, arguments, client_cfg, environ, new_style_args=None):
if new_style_args is None:
dirty = False
+ pull_cache = False
else:
dirty = new_style_args.dirty
+ pull_cache = new_style_args.pull_cache
namespace = config['namespace']
name_map = config.get('names', {})
@@ -249,7 +255,7 @@ def run(path, arguments, client_cfg, environ, new_style_args=None):
'to commit these changes, re-run with the --dirty flag.'
)
- sw = Shipwright(scm, client, arguments['tags'])
+ sw = Shipwright(scm, client, arguments['tags'], pull_cache)
command = getattr(sw, command_name)
show_progress = sys.stdout.isatty()
|
6si/shipwright
|
7d3ccf39acc79bb6d33a787e773227358764dd2c
|
diff --git a/tests/integration/test_docker_builds.py b/tests/integration/test_docker_builds.py
index 00aa6be..3a22616 100644
--- a/tests/integration/test_docker_builds.py
+++ b/tests/integration/test_docker_builds.py
@@ -12,7 +12,7 @@ from .utils import commit_untracked, create_repo, get_defaults
def default_args():
- return argparse.Namespace(dirty=False)
+ return argparse.Namespace(dirty=False, pull_cache=False)
def test_sample(tmpdir, docker_client):
@@ -734,3 +734,85 @@ def test_build_with_repo_digest(tmpdir, docker_client, registry):
)
for image in old_images:
cli.remove_image(image, force=True)
+
+
+def test_docker_buld_pull_cache(tmpdir, docker_client, registry):
+ path = str(tmpdir.join('shipwright-localhost-sample'))
+ source = pkg_resources.resource_filename(
+ __name__,
+ 'examples/shipwright-localhost-sample',
+ )
+ repo = create_repo(path, source)
+ tag = repo.head.ref.commit.hexsha[:12]
+
+ client_cfg = docker_utils.kwargs_from_env()
+ cli = docker_client
+
+ defaults = get_defaults()
+ defaults['push'] = True
+ try:
+ shipw_cli.run(
+ path=path,
+ client_cfg=client_cfg,
+ arguments=defaults,
+ environ={},
+ )
+
+ # Remove the build images:
+ old_images = (
+ cli.images(name='localhost:5000/service1', quiet=True) +
+ cli.images(name='localhost:5000/shared', quiet=True) +
+ cli.images(name='localhost:5000/base', quiet=True)
+ )
+ for image in old_images:
+ cli.remove_image(image, force=True)
+
+ images_after_delete = (
+ cli.images(name='localhost:5000/service1') +
+ cli.images(name='localhost:5000/shared') +
+ cli.images(name='localhost:5000/base')
+ )
+ assert images_after_delete == []
+
+ args = default_args()
+ args.pull_cache = True
+
+ shipw_cli.run(
+ path=path,
+ client_cfg=client_cfg,
+ arguments=defaults,
+ environ={},
+ new_style_args=args,
+ )
+
+ service1, shared, base = (
+ cli.images(name='localhost:5000/service1') +
+ cli.images(name='localhost:5000/shared') +
+ cli.images(name='localhost:5000/base')
+ )
+
+ assert set(service1['RepoTags']) == {
+ 'localhost:5000/service1:master',
+ 'localhost:5000/service1:latest',
+ 'localhost:5000/service1:' + tag,
+ }
+
+ assert set(shared['RepoTags']) == {
+ 'localhost:5000/shared:master',
+ 'localhost:5000/shared:latest',
+ 'localhost:5000/shared:' + tag,
+ }
+
+ assert set(base['RepoTags']) == {
+ 'localhost:5000/base:master',
+ 'localhost:5000/base:latest',
+ 'localhost:5000/base:' + tag,
+ }
+ finally:
+ old_images = (
+ cli.images(name='localhost:5000/service1', quiet=True) +
+ cli.images(name='localhost:5000/shared', quiet=True) +
+ cli.images(name='localhost:5000/base', quiet=True)
+ )
+ for image in old_images:
+ cli.remove_image(image, force=True)
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 260eb92..064f931 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -16,7 +16,6 @@ def get_defaults():
'--exclude': [],
'--help': False,
'--no-build': False,
- '--dirty': False,
'--upto': [],
'--x-assert-hostname': False,
'-H': None,
@@ -90,7 +89,6 @@ def test_args():
'--exclude': [],
'--help': False,
'--no-build': False,
- '--dirty': False,
'--upto': [],
'--x-assert-hostname': True,
'-H': None,
@@ -105,7 +103,7 @@ def test_args_2():
args = [
'--account=x', '--x-assert-hostname', 'build',
'-d', 'foo', 'bar',
- '-t', 'foo', '--dirty',
+ '-t', 'foo', '--dirty', '--pull-cache',
]
parser = cli.argparser()
arguments = cli.old_style_arg_dict(parser.parse_args(args))
@@ -118,7 +116,6 @@ def test_args_2():
'--exclude': [],
'--help': False,
'--no-build': False,
- '--dirty': True,
'--upto': [],
'--x-assert-hostname': True,
'-H': None,
@@ -142,7 +139,6 @@ def test_args_base():
'--exclude': [],
'--help': False,
'--no-build': False,
- '--dirty': False,
'--upto': [],
'--x-assert-hostname': False,
'-H': None,
|
docker pull all images for current branch and master before building
Because our buildserver forgets the docker cache between builds we pull the previous build for all the images.
it would be great if we could get shipwright to do it.
Otherwise a command like "shipright images" which lists all the images that shipwright *would* build would let us write our own command to do this.
|
0.0
|
7d3ccf39acc79bb6d33a787e773227358764dd2c
|
[
"tests/test_cli.py::test_args",
"tests/test_cli.py::test_args_2",
"tests/test_cli.py::test_args_base"
] |
[
"tests/integration/test_docker_builds.py::test_dirty_fails_without_flag",
"tests/test_cli.py::test_without_json_manifest",
"tests/test_cli.py::test_push_also_builds",
"tests/test_cli.py::test_assert_hostname"
] |
{
"failed_lite_validators": [
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2016-08-22 09:51:49+00:00
|
apache-2.0
| 10 |
|
ARM-software__mango-11
|
diff --git a/mango/domain/distribution.py b/mango/domain/distribution.py
index 4f5b69d..bb9e14d 100644
--- a/mango/domain/distribution.py
+++ b/mango/domain/distribution.py
@@ -1,49 +1,5 @@
-# Defining loguniform distribution
-"""
-Credits: Extended from the original definition of rvs function in scipy/scipy/stats/_distn_infrastructure.py
-for the class rv_generic and the _rvs function for the uniform distribution from
-scipy/scipy/stats/_continuous_distns.py
-"""
+from scipy.stats import loguniform as _loguniform
-from scipy.stats import rv_continuous
-import numpy as np
-
-class log_uniform_gen(rv_continuous):
- """A log uniform distribution with base 10
- """
-
- def __init__(self, *args, **kwargs):
- self.base = 10
- super(log_uniform_gen, self).__init__(*args, **kwargs)
-
- def _log(self, x):
- return np.log(x) / np.log(self.base)
-
- def _argcheck(self, a, b):
- return (a > 0) & (b > a)
-
- def _get_support(self, a, b):
- return a, b
-
- def _pdf(self, x, a, b):
- # reciprocal.pdf(x, a, b) = 1 / (x*log(b/a))
- return 1.0 / (x * self._log(b * 1.0 / a))
-
- def _logpdf(self, x, a, b):
- return np.log(x) - np.log(self._log(b * 1.0 / a))
-
- def _cdf(self, x, a, b):
- return (self._log(x) - self._log(a)) / self._log(b * 1.0 / a)
-
- def _ppf(self, q, a, b):
- return a*pow(b*1.0/a, q)
-
- def _munp(self, n, a, b):
- return 1.0/self._log(b*1.0/a) / n * (pow(b*1.0, n) - pow(a*1.0, n))
-
- def _entropy(self, a, b):
- return 0.5*np.log(a*b)+np.log(self._log(b*1.0/a))
-
-
-loguniform = log_uniform_gen(name='loguniform')
\ No newline at end of file
+def loguniform(a, b):
+ return _loguniform(10 ** a, 10 ** (a + b))
|
ARM-software/mango
|
e2d4fd8ae61d2ab8921c94fa2f4dafc1119dbab2
|
diff --git a/mango/tests/test_domain_space.py b/mango/tests/test_domain_space.py
index f393f2b..58fcbc6 100644
--- a/mango/tests/test_domain_space.py
+++ b/mango/tests/test_domain_space.py
@@ -2,6 +2,7 @@ import numpy as np
from scipy.stats import uniform, loguniform
from mango.domain.domain_space import domain_space
+from mango.domain.distribution import loguniform as mango_loguniform
def test_domain():
@@ -34,6 +35,15 @@ def test_domain():
assert (sample[param] in params[param])
+def test_mango_loguniform():
+ space = {
+ 'a': mango_loguniform(-3, 6)
+ }
+ ds = domain_space(space, domain_size=1000)
+ samples = ds.get_domain()
+ assert all(1e-3 < sample['a'] < 1e3 for sample in samples)
+
+
def test_gp_samples_to_params():
space = {
'a': range(10),
@@ -91,7 +101,7 @@ def test_gp_space():
assert (X >= 0.0).all()
assert (X[:, 0] == 1.).all() # a
assert (X[:, 1] == 0.).all() # b
- assert np.isin(X[:, 2], [0.0, 0.5, 1.0]).all() # c
+ assert np.isin(X[:, 2], [0.0, 0.5, 1.0]).all() # c
assert np.isin(X[:, 4:7], np.eye(3)).all() # e
assert X.shape == (ds.domain_size, 12)
@@ -110,5 +120,3 @@ def test_gp_space():
X2 = ds.convert_to_gp(params)
assert np.isclose(X2, X).all()
-
-
|
Domain error in loguniform
Hi,
seems that there is a problem with `loguniform` when one of its argument is negative. For example, my code is runnable when the first argument of `loguniform` is positive and it generates domain error when the first argument is a negative number. Any thought on this?
|
0.0
|
e2d4fd8ae61d2ab8921c94fa2f4dafc1119dbab2
|
[
"mango/tests/test_domain_space.py::test_mango_loguniform"
] |
[
"mango/tests/test_domain_space.py::test_domain",
"mango/tests/test_domain_space.py::test_gp_samples_to_params",
"mango/tests/test_domain_space.py::test_gp_space"
] |
{
"failed_lite_validators": [],
"has_test_patch": true,
"is_lite": true
}
|
2020-06-11 05:56:07+00:00
|
apache-2.0
| 11 |
|
ARM-software__mango-47
|
diff --git a/README.md b/README.md
index 16b11cb..2f14c63 100644
--- a/README.md
+++ b/README.md
@@ -352,8 +352,9 @@ The configuration parameters are:
...
return True/False
```
-Early stopping is one of Mango's important features that allow to early terminate the current parallel search based on the custom user-designed criteria, such as the total optimization time spent, current validation accuracy achieved, or improvements in the past few iterations. For usage see early stopping examples [notebook](https://github.com/ARM-software/mango/blob/master/examples/EarlyStopping.ipynb).
+ Early stopping is one of Mango's important features that allow to early terminate the current parallel search based on the custom user-designed criteria, such as the total optimization time spent, current validation accuracy achieved, or improvements in the past few iterations. For usage see early stopping examples [notebook](https://github.com/ARM-software/mango/blob/master/examples/EarlyStopping.ipynb).
+- initial_custom: A list of initial evaluation points to warm up the optimizer instead of random sampling. For example, for a search space with two parameters `x1` and `x2` the input could be: `[{'x1': 10, 'x2': -5}, {'x1': 0, 'x2': 10}]`. This allows the user to customize the initial evaluation points and therefore guide the optimization process. If this option is given then `initial_random` is ignored.
The default configuration parameters can be modified, as shown below. Only the parameters whose values need to adjusted can be passed as the dictionary.
diff --git a/mango/tuner.py b/mango/tuner.py
index 360a859..97f02a1 100644
--- a/mango/tuner.py
+++ b/mango/tuner.py
@@ -29,6 +29,7 @@ class Tuner:
class Config:
domain_size: int = None
initial_random: int = 2
+ initial_custom: dict = None
num_iteration: int = 20
batch_size: int = 1
optimizer: str = 'Bayesian'
@@ -151,25 +152,35 @@ class Tuner:
self.maximize_objective = False
return self.run()
+
+ def run_initial(self):
+ if self.config.initial_custom is not None:
+ X_tried = copy.deepcopy(self.config.initial_custom)
+ X_list, Y_list = self.runUserObjective(X_tried)
+ else:
+ # getting first few random values
+ X_tried = self.ds.get_random_sample(self.config.initial_random)
+ X_list, Y_list = self.runUserObjective(X_tried)
+
+ # in case initial random results are invalid try different samples
+ n_tries = 1
+ while len(Y_list) < self.config.initial_random and n_tries < 3:
+ X_tried2 = self.ds.get_random_sample(self.config.initial_random - len(Y_list))
+ X_list2, Y_list2 = self.runUserObjective(X_tried2)
+ X_tried2.extend(X_tried2)
+ X_list = np.append(X_list, X_list2)
+ Y_list = np.append(Y_list, Y_list2)
+ n_tries += 1
+
+ if len(Y_list) == 0:
+ raise ValueError("No valid configuration found to initiate the Bayesian Optimizer")
+ return X_list, Y_list, X_tried
+
def runBayesianOptimizer(self):
results = dict()
- # getting first few random values
- random_hyper_parameters = self.ds.get_random_sample(self.config.initial_random)
- X_list, Y_list = self.runUserObjective(random_hyper_parameters)
-
- # in case initial random results are invalid try different samples
- n_tries = 1
- while len(Y_list) < self.config.initial_random and n_tries < 3:
- random_hps = self.ds.get_random_sample(self.config.initial_random - len(Y_list))
- X_list2, Y_list2 = self.runUserObjective(random_hps)
- random_hyper_parameters.extend(random_hps)
- X_list = np.append(X_list, X_list2)
- Y_list = np.append(Y_list, Y_list2)
- n_tries += 1
+ X_list, Y_list, X_tried = self.run_initial()
- if len(Y_list) == 0:
- raise ValueError("No valid configuration found to initiate the Bayesian Optimizer")
# evaluated hyper parameters are used
X_init = self.ds.convert_GP_space(X_list)
@@ -186,7 +197,7 @@ class Tuner:
X_sample = X_init
Y_sample = Y_init
- hyper_parameters_tried = random_hyper_parameters
+ hyper_parameters_tried = X_tried
objective_function_values = Y_list
surrogate_values = Y_list
|
ARM-software/mango
|
a71bc007a0c4e39462fd1810cdbcf99c4e854679
|
diff --git a/tests/test_tuner.py b/tests/test_tuner.py
index 24e7c99..98e5fbd 100644
--- a/tests/test_tuner.py
+++ b/tests/test_tuner.py
@@ -14,7 +14,6 @@ import numpy as np
from mango.domain.domain_space import domain_space
from mango import Tuner, scheduler
from scipy.stats import uniform
-from mango.domain.distribution import loguniform
# Simple param_dict
param_dict = {"a": uniform(0, 1), # uniform distribution
@@ -125,7 +124,7 @@ def test_rosenbrock():
results.append(result)
return results
- tuner = Tuner(param_dict, objfunc, conf_dict=dict(domain_size=100000))
+ tuner = Tuner(param_dict, objfunc, conf_dict=dict(domain_size=100000, num_iteration=40))
results = tuner.run()
print('best hyper parameters:', results['best_params'])
@@ -190,6 +189,40 @@ def test_convex():
assert abs(results['best_params']['y'] - y_opt) <= 3
+def test_initial_custom():
+ param_dict = {
+ 'x': range(-100, 10),
+ 'y': range(-10, 20),
+ }
+
+ x_opt = 0
+ y_opt = 0
+
+ def objfunc(args_list):
+ results = []
+ for hyper_par in args_list:
+ x = hyper_par['x']
+ y = hyper_par['y']
+ result = (x ** 2 + y ** 2) / 1e4
+ results.append(result)
+ return results
+
+ config = dict(initial_custom=[dict(x=-100, y=20),
+ dict(x=10, y=20)]
+ )
+
+ tuner = Tuner(param_dict, objfunc, conf_dict=config)
+ results = tuner.minimize()
+
+ print('best hyper parameters:', results['best_params'])
+ print('best Accuracy:', results['best_objective'])
+
+ assert abs(results['best_params']['x'] - x_opt) <= 3
+ assert abs(results['best_params']['y'] - y_opt) <= 3
+ assert results['random_params'][0] == config['initial_custom'][0]
+ assert results['random_params'][1] == config['initial_custom'][1]
+
+
def test_local_scheduler():
param_space = dict(x=range(-10, 10),
y=range(-10, 10))
|
Is it possible to add an initial data point?
The way Im currently using mango, I will always have a first run with good defaults. Is it possible to use this information somehow? I have quite wide ranges for my hyper parameters, and I think this would help a lot.
|
0.0
|
a71bc007a0c4e39462fd1810cdbcf99c4e854679
|
[
"tests/test_tuner.py::test_initial_custom"
] |
[
"tests/test_tuner.py::test_domain",
"tests/test_tuner.py::test_tuner",
"tests/test_tuner.py::test_rosenbrock",
"tests/test_tuner.py::test_config",
"tests/test_tuner.py::test_convex",
"tests/test_tuner.py::test_six_hump",
"tests/test_tuner.py::test_celery_scheduler",
"tests/test_tuner.py::test_custom_scheduler",
"tests/test_tuner.py::test_early_stopping_simple",
"tests/test_tuner.py::test_early_stopping_complex"
] |
{
"failed_lite_validators": [
"has_many_modified_files",
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2022-03-02 18:10:44+00:00
|
apache-2.0
| 12 |
|
ARMmbed__greentea-237
|
diff --git a/mbed_greentea/mbed_report_api.py b/mbed_greentea/mbed_report_api.py
index da3f0d9..82acb5c 100644
--- a/mbed_greentea/mbed_report_api.py
+++ b/mbed_greentea/mbed_report_api.py
@@ -38,6 +38,13 @@ def exporter_json(test_result_ext, test_suite_properties=None):
@details This is a machine friendly format
"""
import json
+ for target in test_result_ext.values():
+ for suite in target.values():
+ try:
+ suite["single_test_output"] = suite["single_test_output"]\
+ .decode("unicode_escape")
+ except KeyError:
+ pass
return json.dumps(test_result_ext, indent=4)
@@ -211,7 +218,10 @@ def exporter_testcase_junit(test_result_ext, test_suite_properties=None):
test_cases.append(tc)
ts_name = target_name
- test_build_properties = test_suite_properties[target_name] if target_name in test_suite_properties else None
+ if test_suite_properties and target_name in test_suite_properties:
+ test_build_properties = test_suite_properties[target_name]
+ else:
+ test_build_properties = None
ts = TestSuite(ts_name, test_cases, properties=test_build_properties)
test_suites.append(ts)
@@ -584,7 +594,9 @@ def get_result_overlay_dropdowns(result_div_id, test_results):
result_output_div_id = "%s_output" % result_div_id
result_output_dropdown = get_dropdown_html(result_output_div_id,
"Test Output",
- test_results['single_test_output'].rstrip("\n"),
+ test_results['single_test_output']
+ .decode("unicode-escape")
+ .rstrip("\n"),
output_text=True)
# Add a dropdown for the testcases if they are present
@@ -740,10 +752,14 @@ def exporter_html(test_result_ext, test_suite_properties=None):
test_results['single_test_count'] += 1
result_class = get_result_colour_class(test_results['single_test_result'])
+ try:
+ percent_pass = int((test_results['single_test_passes']*100.0)/test_results['single_test_count'])
+ except ZeroDivisionError:
+ percent_pass = 100
this_row += result_cell_template % (result_class,
result_div_id,
test_results['single_test_result'],
- int((test_results['single_test_passes']*100.0)/test_results['single_test_count']),
+ percent_pass,
test_results['single_test_passes'],
test_results['single_test_count'],
result_overlay)
|
ARMmbed/greentea
|
86f5ec3211a8f7f324bcdd3201012945ee0534ac
|
diff --git a/test/report_api.py b/test/report_api.py
new file mode 100644
index 0000000..122e26e
--- /dev/null
+++ b/test/report_api.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+"""
+mbed SDK
+Copyright (c) 2017 ARM Limited
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import unittest
+from mock import patch
+
+from mbed_greentea.mbed_report_api import exporter_html, \
+ exporter_memory_metrics_csv, exporter_testcase_junit, \
+ exporter_testcase_text, exporter_text, exporter_json
+
+
+class ReportEmitting(unittest.TestCase):
+
+
+ report_fns = [exporter_html, exporter_memory_metrics_csv,
+ exporter_testcase_junit, exporter_testcase_text,
+ exporter_text, exporter_json]
+ def test_report_zero_tests(self):
+ test_data = {}
+ for report_fn in self.report_fns:
+ report_fn(test_data)
+
+ def test_report_zero_testcases(self):
+ test_data = {
+ 'k64f-gcc_arm': {
+ 'garbage_test_suite' :{
+ u'single_test_result': u'NOT_RAN',
+ u'elapsed_time': 0.0,
+ u'build_path': u'N/A',
+ u'build_path_abs': u'N/A',
+ u'copy_method': u'N/A',
+ u'image_path': u'N/A',
+ u'single_test_output': b'N/A',
+ u'platform_name': u'k64f',
+ u'test_bin_name': u'N/A',
+ u'testcase_result': {},
+ }
+ }
+ }
+ for report_fn in self.report_fns:
+ report_fn(test_data)
|
mbedgt crash with float division by zero
Hi
Here is my command:
mbedgt -V -v -t NUCLEO_F401RE-ARM,NUCLEO_F401RE-GCC_ARM,NUCLEO_F401RE-IAR,NUCLEO_F410RB-ARM,NUCLEO_F410RB-GCC_ARM,NUCLEO_F410RB-IAR,NUCLEO_F411RE-ARM,NUCLEO_F411RE-GCC_ARM,NUCLEO_F411RE-IAR --report-html=/c/xxx.html
It has crashed:
...
mbedgt: all tests finished!
mbedgt: shuffle seed: 0.3680156551
mbedgt: exporting to HTML file
mbedgt: unexpected error:
float division by zero
Traceback (most recent call last):
File "C:\Python27\Scripts\mbedgt-script.py", line 11, in <module>
load_entry_point('mbed-greentea==1.2.6', 'console_scripts', 'mbedgt')()
File "c:\python27\lib\site-packages\mbed_greentea\mbed_greentea_cli.py", line 401, in main
cli_ret = main_cli(opts, args)
File "c:\python27\lib\site-packages\mbed_greentea\mbed_greentea_cli.py", line 1050, in main_cli
html_report = exporter_html(test_report)
File "c:\python27\lib\site-packages\mbed_greentea\mbed_report_api.py", line 747, in exporter_html
int((test_results['single_test_passes']*100.0)/test_results['single_test_count']),
ZeroDivisionError: float division by zero
|
0.0
|
86f5ec3211a8f7f324bcdd3201012945ee0534ac
|
[
"test/report_api.py::ReportEmitting::test_report_zero_testcases"
] |
[
"test/report_api.py::ReportEmitting::test_report_zero_tests"
] |
{
"failed_lite_validators": [
"has_many_hunks"
],
"has_test_patch": true,
"is_lite": false
}
|
2017-09-25 13:51:40+00:00
|
apache-2.0
| 13 |
|
ARMmbed__greentea-243
|
diff --git a/mbed_greentea/mbed_report_api.py b/mbed_greentea/mbed_report_api.py
index 166bc29..22a3778 100644
--- a/mbed_greentea/mbed_report_api.py
+++ b/mbed_greentea/mbed_report_api.py
@@ -42,7 +42,7 @@ def exporter_json(test_result_ext, test_suite_properties=None):
for suite in target.values():
try:
suite["single_test_output"] = suite["single_test_output"]\
- .decode("unicode_escape")
+ .decode("utf-8", "replace")
except KeyError:
pass
return json.dumps(test_result_ext, indent=4)
@@ -603,7 +603,7 @@ def get_result_overlay_dropdowns(result_div_id, test_results):
result_output_dropdown = get_dropdown_html(result_output_div_id,
"Test Output",
test_results['single_test_output']
- .decode("unicode-escape")
+ .decode("utf-8", "replace")
.rstrip("\n"),
output_text=True)
|
ARMmbed/greentea
|
8f7b28f8ec739156d238304fa4f5f2e5156536f5
|
diff --git a/test/report_api.py b/test/report_api.py
index 122e26e..2a4275f 100644
--- a/test/report_api.py
+++ b/test/report_api.py
@@ -45,7 +45,7 @@ class ReportEmitting(unittest.TestCase):
u'build_path_abs': u'N/A',
u'copy_method': u'N/A',
u'image_path': u'N/A',
- u'single_test_output': b'N/A',
+ u'single_test_output': b'\x80abc\uXXXX' ,
u'platform_name': u'k64f',
u'test_bin_name': u'N/A',
u'testcase_result': {},
|
mbedgt crash with UnicodeDecodeError
Hi
I am sorry, but I still get some crash with the new green tea version ...
mbedgt: exporting to HTML file 'C:/mcu/reports/report__mbed_os5_release_non_regression_F756ZG_mbed-os-5.5.7__2017_09_28_00_06.html'...
mbedgt: unexpected error:
'unicodeescape' codec can't decode bytes in position 6308-6310: truncated \uXXXX escape
Traceback (most recent call last):
File "C:\Python27\Scripts\mbedgt-script.py", line 11, in <module>
load_entry_point('mbed-greentea==1.3.0', 'console_scripts', 'mbedgt')()
File "c:\python27\lib\site-packages\mbed_greentea\mbed_greentea_cli.py", line 416, in main
cli_ret = main_cli(opts, args)
File "c:\python27\lib\site-packages\mbed_greentea\mbed_greentea_cli.py", line 1067, in main_cli
html_report = exporter_html(test_report)
File "c:\python27\lib\site-packages\mbed_greentea\mbed_report_api.py", line 747, in exporter_html
test_results)
File "c:\python27\lib\site-packages\mbed_greentea\mbed_report_api.py", line 636, in get_result_overlay
overlay_dropdowns = get_result_overlay_dropdowns(result_div_id, test_results)
File "c:\python27\lib\site-packages\mbed_greentea\mbed_report_api.py", line 598, in get_result_overlay_dropdowns
.decode("unicode-escape")
UnicodeDecodeError: 'unicodeescape' codec can't decode bytes in position 6308-6310: truncated \uXXXX escape
@theotherjimmy
|
0.0
|
8f7b28f8ec739156d238304fa4f5f2e5156536f5
|
[
"test/report_api.py::ReportEmitting::test_report_zero_testcases"
] |
[
"test/report_api.py::ReportEmitting::test_report_zero_tests"
] |
{
"failed_lite_validators": [],
"has_test_patch": true,
"is_lite": true
}
|
2017-09-29 17:09:53+00:00
|
apache-2.0
| 14 |
|
ARMmbed__greentea-250
|
diff --git a/mbed_greentea/mbed_target_info.py b/mbed_greentea/mbed_target_info.py
index 356676b..c825bcf 100644
--- a/mbed_greentea/mbed_target_info.py
+++ b/mbed_greentea/mbed_target_info.py
@@ -20,6 +20,17 @@ Author: Przemyslaw Wirkus <Przemyslaw.Wirkus@arm.com>
import os
import re
import json
+from os import walk
+try:
+ from contextlib import suppress
+except ImportError:
+ from contextlib import contextmanager
+ @contextmanager
+ def suppress(*excs):
+ try:
+ yield
+ except excs:
+ pass
from mbed_greentea.mbed_common_api import run_cli_process
from mbed_greentea.mbed_greentea_log import gt_logger
@@ -381,82 +392,65 @@ def get_platform_property(platform, property):
:return: property value, None if property not found
"""
- # First load from targets.json if available
- value_from_targets_json = get_platform_property_from_targets(platform, property)
- if value_from_targets_json:
- return value_from_targets_json
-
- # Check if info is available for a specific platform
- if platform in TARGET_INFO_MAPPING:
- if property in TARGET_INFO_MAPPING[platform]['properties']:
- return TARGET_INFO_MAPPING[platform]['properties'][property]
+ default = _get_platform_property_from_default(property)
+ from_targets_json = _get_platform_property_from_targets(
+ platform, property, default)
+ if from_targets_json:
+ return from_targets_json
+ from_info_mapping = _get_platform_property_from_info_mapping(platform, property)
+ if from_info_mapping:
+ return from_info_mapping
+ return default
+
+def _get_platform_property_from_default(property):
+ with suppress(KeyError):
+ return TARGET_INFO_MAPPING['default'][property]
+
+def _get_platform_property_from_info_mapping(platform, property):
+ with suppress(KeyError):
+ return TARGET_INFO_MAPPING[platform]['properties'][property]
+
+def _platform_property_from_targets_json(targets, platform, property, default):
+ """! Get a platforms's property from the target data structure in
+ targets.json. Takes into account target inheritance.
+ @param targets Data structure parsed from targets.json
+ @param platform Name of the platform
+ @param property Name of the property
+ @param default the fallback value if none is found, but the target exists
+ @return property value, None if property not found
- # Check if default data is available
- if 'default' in TARGET_INFO_MAPPING:
- if property in TARGET_INFO_MAPPING['default']:
- return TARGET_INFO_MAPPING['default'][property]
-
- return None
+ """
+ with suppress(KeyError):
+ return targets[platform][property]
+ with suppress(KeyError):
+ for inherited_target in targets[platform]['inherits']:
+ result = _platform_property_from_targets_json(targets, inherited_target, property, None)
+ if result:
+ return result
+ if platform in targets:
+ return default
+
+IGNORED_DIRS = ['.build', 'BUILD', 'tools']
+
+def _find_targets_json(path):
+ for root, dirs, files in walk(path, followlinks=True):
+ for ignored_dir in IGNORED_DIRS:
+ if ignored_dir in dirs:
+ dirs.remove(ignored_dir)
+ if 'targets.json' in files:
+ yield os.path.join(root, 'targets.json')
-def get_platform_property_from_targets(platform, property):
+def _get_platform_property_from_targets(platform, property, default):
"""
Load properties from targets.json file somewhere in the project structure
:param platform:
:return: property value, None if property not found
"""
-
- def get_platform_property_from_targets(targets, platform, property):
- """! Get a platforms's property from the target data structure in
- targets.json. Takes into account target inheritance.
- @param targets Data structure parsed from targets.json
- @param platform Name of the platform
- @param property Name of the property
- @return property value, None if property not found
-
- """
-
- result = None
- if platform in targets:
- if property in targets[platform]:
- result = targets[platform][property]
- elif 'inherits' in targets[platform]:
- result = None
- for inherited_target in targets[platform]['inherits']:
- result = get_platform_property_from_targets(targets, inherited_target, property)
-
- # Stop searching after finding the first value for the property
- if result:
- break
-
- return result
-
- result = None
- targets_json_path = []
- for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
- ignored_dirs = ['.build', 'BUILD', 'tools']
-
- for ignored_dir in ignored_dirs:
- if ignored_dir in dirs:
- dirs.remove(ignored_dir)
-
- if 'targets.json' in files:
- targets_json_path.append(os.path.join(root, 'targets.json'))
-
- if not targets_json_path:
- gt_logger.gt_log_warn("No targets.json files found, using default target properties")
-
- for targets_path in targets_json_path:
- try:
+ for targets_path in _find_targets_json(os.getcwd()):
+ with suppress(IOError, ValueError):
with open(targets_path, 'r') as f:
targets = json.load(f)
-
- # Load property from targets.json
- result = get_platform_property_from_targets(targets, platform, property)
-
- # If a valid property was found, stop looking
+ result = _platform_property_from_targets_json(targets, platform, property, default)
if result:
- break
- except Exception:
- continue
- return result
+ return result
diff --git a/setup.py b/setup.py
index e98e109..0734dfe 100644
--- a/setup.py
+++ b/setup.py
@@ -50,13 +50,15 @@ setup(name='mbed-greentea',
license=LICENSE,
test_suite = 'test',
entry_points={
- "console_scripts": ["mbedgt=mbed_greentea.mbed_greentea_cli:main",],
+ "console_scripts": ["mbedgt=mbed_greentea.mbed_greentea_cli:main",],
},
install_requires=["PrettyTable>=0.7.2",
- "PySerial>=3.0",
- "mbed-host-tests>=1.2.0",
- "mbed-ls>=1.2.15",
- "junit-xml",
- "lockfile",
- "mock",
- "colorama>=0.3,<0.4"])
+ "PySerial>=3.0",
+ "mbed-host-tests>=1.2.0",
+ "mbed-ls>=1.2.15",
+ "junit-xml",
+ "lockfile",
+ "mock",
+ "six",
+ "colorama>=0.3,<0.4"])
+
|
ARMmbed/greentea
|
b8bcffbb7aaced094f252a4ddfe930e8237fb484
|
diff --git a/test/mbed_gt_target_info.py b/test/mbed_gt_target_info.py
index e3f0a6a..96cd1db 100644
--- a/test/mbed_gt_target_info.py
+++ b/test/mbed_gt_target_info.py
@@ -21,6 +21,8 @@ import shutil
import tempfile
import unittest
+from six import StringIO
+
from mock import patch
from mbed_greentea import mbed_target_info
@@ -338,8 +340,168 @@ mbed-gcc 1.1.0
result = mbed_target_info.add_target_info_mapping("null")
- def test_get_platform_property_from_targets(self):
- result = mbed_target_info.get_platform_property_from_targets({}, {})
+ def test_get_platform_property_from_targets_no_json(self):
+ with patch("mbed_greentea.mbed_target_info._find_targets_json") as _find:
+ _find.return_value = iter([])
+ result = mbed_target_info._get_platform_property_from_targets("not_a_platform", "not_a_property", "default")
+ self.assertIsNone(result)
+
+ def test_get_platform_property_from_targets_no_file(self):
+ with patch("mbed_greentea.mbed_target_info._find_targets_json") as _find,\
+ patch("mbed_greentea.mbed_target_info.open") as _open:
+ _find.return_value = iter(["foo"])
+ _open.side_effect = IOError
+ result = mbed_target_info._get_platform_property_from_targets("not_a_platform", "not_a_property", "default")
+ self.assertIsNone(result)
+
+ def test_get_platform_property_from_targets_invalid_json(self):
+ with patch("mbed_greentea.mbed_target_info._find_targets_json") as _find,\
+ patch("mbed_greentea.mbed_target_info.open") as _open:
+ _find.return_value = iter(["foo"])
+ _open.return_value.__enter__.return_value = StringIO("{")
+ result = mbed_target_info._get_platform_property_from_targets("not_a_platform", "not_a_property", "default")
+ self.assertIsNone(result)
+
+ def test_get_platform_property_from_targets_empty_json(self):
+ with patch("mbed_greentea.mbed_target_info._find_targets_json") as _find,\
+ patch("mbed_greentea.mbed_target_info.open") as _open:
+ _find.return_value = iter(["foo"])
+ _open.return_value.__enter__.return_value = StringIO("{}")
+ result = mbed_target_info._get_platform_property_from_targets("not_a_platform", "not_a_property", "default")
+ self.assertIsNone(result)
+
+ def test_get_platform_property_from_targets_no_value(self):
+ with patch("mbed_greentea.mbed_target_info._find_targets_json") as _find,\
+ patch("mbed_greentea.mbed_target_info.open") as _open:
+ _find.return_value = iter(["foo"])
+ _open.return_value.__enter__.return_value = StringIO("{\"K64F\": {}}")
+ result = mbed_target_info._get_platform_property_from_targets("K64F", "not_a_property", "default")
+ self.assertEqual(result, "default")
+
+ def test_get_platform_property_from_targets_in_json(self):
+ with patch("mbed_greentea.mbed_target_info._find_targets_json") as _find,\
+ patch("mbed_greentea.mbed_target_info.open") as _open:
+ _find.return_value = iter(["foo"])
+ _open.return_value.__enter__.return_value = StringIO("{\"K64F\": {\"copy_method\": \"cp\"}}")
+ result = mbed_target_info._get_platform_property_from_targets("K64F", "copy_method", "default")
+ self.assertEqual("cp", result)
+
+ def test_find_targets_json(self):
+ with patch("mbed_greentea.mbed_target_info.walk") as _walk:
+ _walk.return_value = iter([("", ["foo"], []), ("foo", [], ["targets.json"])])
+ result = list(mbed_target_info._find_targets_json("bogus_path"))
+ self.assertEqual(result, ["foo/targets.json"])
+
+ def test_find_targets_json_ignored(self):
+ with patch("mbed_greentea.mbed_target_info.walk") as _walk:
+ walk_result =[("", [".build"], [])]
+ _walk.return_value = iter(walk_result)
+ result = list(mbed_target_info._find_targets_json("bogus_path"))
+ self.assertEqual(result, [])
+ self.assertEqual(walk_result, [("", [], [])])
+
+ def test_platform_property_from_targets_json_empty(self):
+ result = mbed_target_info._platform_property_from_targets_json(
+ {}, "not_a_target", "not_a_property", "default"
+ )
+ self.assertIsNone(result)
+
+ def test_platform_property_from_targets_json_base_target(self):
+ result = mbed_target_info._platform_property_from_targets_json(
+ {"K64F": {"copy_method": "cp"}}, "K64F", "copy_method", "default"
+ )
+ self.assertEqual(result, "cp")
+
+ def test_platform_property_from_targets_json_inherits(self):
+ result = mbed_target_info._platform_property_from_targets_json(
+ {"K64F": {"inherits": ["Target"]}, "Target": {"copy_method": "cp"}},
+ "K64F", "copy_method", "default"
+ )
+ self.assertEqual(result, "cp")
+
+ def test_platform_property_from_default_missing(self):
+ result = mbed_target_info._get_platform_property_from_default("not_a_property")
+ self.assertIsNone(result)
+
+ def test_platform_property_from_default(self):
+ result = mbed_target_info._get_platform_property_from_default("copy_method")
+ self.assertEqual(result, "default")
+
+ def test_platform_property_from_info_mapping_bad_platform(self):
+ result = mbed_target_info._get_platform_property_from_info_mapping("not_a_platform", "not_a_property")
+ self.assertIsNone(result)
+
+ def test_platform_property_from_info_mapping_missing(self):
+ result = mbed_target_info._get_platform_property_from_info_mapping("K64F", "not_a_property")
+ self.assertIsNone(result)
+
+ def test_platform_property_from_info_mapping(self):
+ result = mbed_target_info._get_platform_property_from_info_mapping("K64F", "copy_method")
+ self.assertEqual(result, "default")
+
+
+ # The following test cases are taken from this table:
+ #
+ # Num | In targets.json | In yotta blob | In Default | property used
+ # --- | --------------- | ------------- | ---------- | --------------
+ # 1 | Yes | No | Yes |`targets.json`
+ # 2 | Yes | Yes | Yes |`targets.json`
+ # 3 | No | Yes | Yes | yotta blob
+ # 4 | No | No | Yes | default
+ # 5 | No | No | No | None
+ # 6 | Yes | No | No |`targets.json`
+ # 7 | Yes | Yes | No |`targets.json`
+ # 8 | No | Yes | No | yotta blob
+ def test_platform_property(self):
+ """Test that platform_property picks the property value preserving
+ the following priority relationship:
+ targets.json > yotta blob > default
+ """
+ with patch("mbed_greentea.mbed_target_info._get_platform_property_from_targets") as _targets,\
+ patch("mbed_greentea.mbed_target_info._get_platform_property_from_info_mapping") as _info_mapping,\
+ patch("mbed_greentea.mbed_target_info._get_platform_property_from_default") as _default:
+ # 1
+ _targets.return_value = "targets"
+ _info_mapping.return_value = None
+ _default.return_value = "default"
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "targets")
+ # 2
+ _info_mapping.return_value = "yotta"
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "targets")
+ # 3
+ _targets.return_value = None
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "yotta")
+ # 4
+ _info_mapping.return_value = None
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "default")
+ # 5
+ _default.return_value = None
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ None)
+ # 6
+ _targets.return_value = "targets"
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "targets")
+ # 7
+ _info_mapping.return_value = "yotta"
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "targets")
+ # 8
+ _targets.return_value = None
+ self.assertEqual(
+ mbed_target_info.get_platform_property("K64F", "copy_method"),
+ "yotta")
def test_parse_yotta_json_for_build_name(self):
|
Target property priority incorrect
Currently we have priority as follows:
```
internal yotta blob > targets.json > tool default
```
This is a bug.
Instead the priority should be:
```
targets.json /w default > internal yotta blob > tool delaut
```
This implies a few test cases:
In targets.json | In yotta blob | property used | Currently Works
---------------------- | ------------- | ---------------- | ---------------
Yes, with property | No | `targets.json` | Yes
Yes, without property| No | default | Yes
Yes, with property | Yes | `targets.json` | No
Yes, without property | Yes | default | No
No | No | default | Yes
No | Yes | yotta blob | Yes
@bridadan Is this the issue masked by #248?
|
0.0
|
b8bcffbb7aaced094f252a4ddfe930e8237fb484
|
[
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_inherits",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_invalid_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_in_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_base_target",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_bad_platform",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_file",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default_missing",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_missing",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json_ignored",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_empty_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_value",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_empty",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default"
] |
[
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_keywords",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_path",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_failed_open",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_valid_path",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_invalid_path",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_add_target_info_mapping",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_json_for_build_name",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_multiple",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl_whitechars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_target",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_target_from_current_dir_ok",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_json_data",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_whitechars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text_2",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_chars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl_whitechars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_version",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_name",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_valid",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_target",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_with_ssl_errors",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_fail",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_text"
] |
{
"failed_lite_validators": [
"has_many_modified_files"
],
"has_test_patch": true,
"is_lite": false
}
|
2017-10-20 19:13:58+00:00
|
apache-2.0
| 15 |
|
ARMmbed__greentea-263
|
diff --git a/mbed_greentea/mbed_greentea_cli.py b/mbed_greentea/mbed_greentea_cli.py
index f6a13c4..446b965 100644
--- a/mbed_greentea/mbed_greentea_cli.py
+++ b/mbed_greentea/mbed_greentea_cli.py
@@ -23,6 +23,7 @@ import os
import sys
import random
import optparse
+import fnmatch
from time import time
try:
from Queue import Queue
@@ -119,18 +120,6 @@ def create_filtered_test_list(ctest_test_list, test_by_names, skip_test, test_sp
@return
"""
- def filter_names_by_prefix(test_case_name_list, prefix_name):
- """!
- @param test_case_name_list List of all test cases
- @param prefix_name Prefix of test name we are looking for
- @result Set with names of test names starting with 'prefix_name'
- """
- result = list()
- for test_name in test_case_name_list:
- if test_name.startswith(prefix_name):
- result.append(test_name)
- return sorted(result)
-
filtered_ctest_test_list = ctest_test_list
test_list = None
invalid_test_names = []
@@ -143,17 +132,15 @@ def create_filtered_test_list(ctest_test_list, test_by_names, skip_test, test_sp
gt_logger.gt_log("test case filter (specified with -n option)")
for test_name in set(test_list):
- if test_name.endswith('*'):
- # This 'star-sufix' filter allows users to filter tests with fixed prefixes
- # Example: -n 'TESTS-mbed_drivers* will filter all test cases with name starting with 'TESTS-mbed_drivers'
- for test_name_filtered in filter_names_by_prefix(ctest_test_list.keys(), test_name[:-1]):
- gt_logger.gt_log_tab("test filtered in '%s'"% gt_logger.gt_bright(test_name_filtered))
- filtered_ctest_test_list[test_name_filtered] = ctest_test_list[test_name_filtered]
- elif test_name not in ctest_test_list:
- invalid_test_names.append(test_name)
+ gt_logger.gt_log_tab(test_name)
+ matches = [test for test in ctest_test_list.keys() if fnmatch.fnmatch(test, test_name)]
+ gt_logger.gt_log_tab(str(ctest_test_list))
+ if matches:
+ for match in matches:
+ gt_logger.gt_log_tab("test filtered in '%s'"% gt_logger.gt_bright(match))
+ filtered_ctest_test_list[match] = ctest_test_list[match]
else:
- gt_logger.gt_log_tab("test filtered in '%s'"% gt_logger.gt_bright(test_name))
- filtered_ctest_test_list[test_name] = ctest_test_list[test_name]
+ invalid_test_names.append(test_name)
if skip_test:
test_list = skip_test.split(',')
|
ARMmbed/greentea
|
68508c5f4d7cf0635c75399d0ff7cfa896fdf2cc
|
diff --git a/test/mbed_gt_cli.py b/test/mbed_gt_cli.py
index 0646c20..8f4a1eb 100644
--- a/test/mbed_gt_cli.py
+++ b/test/mbed_gt_cli.py
@@ -21,6 +21,36 @@ import sys
import unittest
from mbed_greentea import mbed_greentea_cli
+from mbed_greentea.tests_spec import TestSpec
+
+test_spec_def = {
+ "builds": {
+ "K64F-ARM": {
+ "platform": "K64F",
+ "toolchain": "ARM",
+ "base_path": "./.build/K64F/ARM",
+ "baud_rate": 115200,
+ "tests": {
+ "mbed-drivers-test-generic_tests":{
+ "binaries":[
+ {
+ "binary_type": "bootable",
+ "path": "./.build/K64F/ARM/mbed-drivers-test-generic_tests.bin"
+ }
+ ]
+ },
+ "mbed-drivers-test-c_strings":{
+ "binaries":[
+ {
+ "binary_type": "bootable",
+ "path": "./.build/K64F/ARM/mbed-drivers-test-c_strings.bin"
+ }
+ ]
+ }
+ }
+ }
+ }
+}
class GreenteaCliFunctionality(unittest.TestCase):
@@ -86,5 +116,36 @@ class GreenteaCliFunctionality(unittest.TestCase):
os.chdir(curr_dir)
shutil.rmtree(test1_dir)
+ def test_create_filtered_test_list(self):
+ test_spec = TestSpec()
+ test_spec.parse(test_spec_def)
+ test_build = test_spec.get_test_builds()[0]
+
+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),
+ 'mbed-drivers-test-generic_*',
+ None,
+ test_spec=test_spec)
+ self.assertEqual(set(test_list.keys()), set(['mbed-drivers-test-generic_tests']))
+
+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),
+ '*_strings',
+ None,
+ test_spec=test_spec)
+ self.assertEqual(set(test_list.keys()), set(['mbed-drivers-test-c_strings']))
+
+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),
+ 'mbed*s',
+ None,
+ test_spec=test_spec)
+ expected = set(['mbed-drivers-test-c_strings', 'mbed-drivers-test-generic_tests'])
+ self.assertEqual(set(test_list.keys()), expected)
+
+ test_list = mbed_greentea_cli.create_filtered_test_list(test_build.get_tests(),
+ '*-drivers-*',
+ None,
+ test_spec=test_spec)
+ expected = set(['mbed-drivers-test-c_strings', 'mbed-drivers-test-generic_tests'])
+ self.assertEqual(set(test_list.keys()), expected)
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/mbed_gt_target_info.py b/test/mbed_gt_target_info.py
index e630e7b..a12ba09 100644
--- a/test/mbed_gt_target_info.py
+++ b/test/mbed_gt_target_info.py
@@ -416,7 +416,7 @@ mbed-gcc 1.1.0
with patch("mbed_greentea.mbed_target_info.walk") as _walk:
_walk.return_value = iter([("", ["foo"], []), ("foo", [], ["targets.json"])])
result = list(mbed_target_info._find_targets_json("bogus_path"))
- self.assertEqual(result, ["foo/targets.json"])
+ self.assertEqual(result, [os.path.join("foo", "targets.json")])
def test_find_targets_json_ignored(self):
with patch("mbed_greentea.mbed_target_info.walk") as _walk:
|
Test names are not correctly globbed
Test names only respect a wildcard that is placed at the end of the string. Ex. "mbed-os-*".
However, it does not respect the wildcard anywhere else. Ex. "*-timer"
The build tools accept these wildcards, so greentea should as well. This is the line responsible: https://github.com/ARMmbed/greentea/blob/32b95b44be653c3db527c02e1c5e1ffdc7d37f6f/mbed_greentea/mbed_greentea_cli.py#L146
Should be switched to `fnmatch`.
(This is mostly a note to myself to fix it)
|
0.0
|
68508c5f4d7cf0635c75399d0ff7cfa896fdf2cc
|
[
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_create_filtered_test_list"
] |
[
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_invalid_path",
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_hello_string",
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_default_path",
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_local_host_tests_dir_valid_path",
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_get_greentea_version",
"test/mbed_gt_cli.py::GreenteaCliFunctionality::test_print_version",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json_ignored",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_path",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_value",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_add_target_info_mapping",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_chars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_json_for_build_name",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_fail",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_invalid_target",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl_whitechars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_multiple",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_whitechars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_text",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_version",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_targets_from_yotta_local_module_valid",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_keywords",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_with_ssl_errors",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_no_name",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_invalid_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_inherits",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_invalid_path",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_failed_open",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_default_missing",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_nl_whitechars",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_name",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_target",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_target_cmd_output_mixed_rcnl",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_yotta_target_from_local_config_valid_path",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_missing_json_data",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_empty",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_bad_platform",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_info_mapping_missing",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output_new_style_text_2",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_mbed_target_from_target_json_no_keywords",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_no_file",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_empty_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_platform_property_from_targets_in_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_get_mbed_target_from_current_dir_ok",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_find_targets_json",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_parse_yotta_search_cmd_output",
"test/mbed_gt_target_info.py::GreenteaTargetInfo::test_platform_property_from_targets_json_base_target"
] |
{
"failed_lite_validators": [],
"has_test_patch": true,
"is_lite": true
}
|
2018-02-15 17:29:56+00:00
|
apache-2.0
| 16 |
|
ARMmbed__mbed-tools-138
|
diff --git a/news/20201201142709.bugfix b/news/20201201142709.bugfix
new file mode 100644
index 0000000..0468f3e
--- /dev/null
+++ b/news/20201201142709.bugfix
@@ -0,0 +1,1 @@
+Fix bug where we failed to handle config options that contain quotes (#125)
diff --git a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl
index e4820af..08ccced 100644
--- a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl
+++ b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl
@@ -65,7 +65,7 @@ set(MBED_CONFIG_DEFINITIONS
# options
{% for option in options -%}
{% if option.value is not none -%}
- {%if '{' in option.value|string or '(' in option.value|string %}"{% endif %}-D{{option.macro_name}}={{option.value}}{% if '}' in option.value|string or ')' in option.value|string %}"{% endif %}
+ "-D{{option.macro_name}}={{option.value|replace("\"", "\\\"")}}"
{% endif %}
{%- endfor %}
# macros
|
ARMmbed/mbed-tools
|
94a3bd761d6ab3305c81da93517767aafff58d7e
|
diff --git a/tests/build/_internal/test_cmake_file.py b/tests/build/_internal/test_cmake_file.py
index 1f59cb3..b0247a8 100644
--- a/tests/build/_internal/test_cmake_file.py
+++ b/tests/build/_internal/test_cmake_file.py
@@ -2,67 +2,69 @@
# Copyright (C) 2020 Arm Mbed. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
-from unittest import TestCase
+import pytest
-from tests.build._internal.config.factories import ConfigFactory
+from tests.build._internal.config.factories import ConfigFactory, SourceFactory
from mbed_tools.build._internal.cmake_file import generate_mbed_config_cmake_file, _render_mbed_config_cmake_template
+from mbed_tools.build._internal.config.config import _create_config_option
-class TestGenerateCMakeListsFile(TestCase):
- def test_correct_arguments_passed(self):
- target = dict()
- target["labels"] = ["foo"]
- target["extra_labels"] = ["morefoo"]
- target["features"] = ["bar"]
- target["components"] = ["baz"]
- target["macros"] = ["macbaz"]
- target["device_has"] = ["stuff"]
- target["c_lib"] = ["c_lib"]
- target["core"] = ["core"]
- target["printf_lib"] = ["printf_lib"]
- target["supported_form_factors"] = ["arduino"]
+TOOLCHAIN_NAME = "gcc"
+
+
+@pytest.fixture()
+def fake_target():
+ return {
+ "labels": ["foo"],
+ "extra_labels": ["morefoo"],
+ "features": ["bar"],
+ "components": ["baz"],
+ "macros": ["macbaz"],
+ "device_has": ["stuff"],
+ "c_lib": ["c_lib"],
+ "core": ["core"],
+ "printf_lib": ["printf_lib"],
+ "supported_form_factors": ["arduino"],
+ "supported_c_libs": {TOOLCHAIN_NAME: ["ginormous"]},
+ "supported_application_profiles": ["full", "bare-metal"],
+ }
+
+
+class TestGenerateCMakeListsFile:
+ def test_correct_arguments_passed(self, fake_target):
config = ConfigFactory()
mbed_target = "K64F"
- toolchain_name = "GCC"
- target["supported_c_libs"] = {toolchain_name.lower(): ["small", "std"]}
- target["supported_application_profiles"] = ["full", "bare-metal"]
-
- result = generate_mbed_config_cmake_file(mbed_target, target, config, toolchain_name)
-
- self.assertEqual(
- result, _render_mbed_config_cmake_template(target, config, toolchain_name, mbed_target,),
- )
-
-
-class TestRendersCMakeListsFile(TestCase):
- def test_returns_rendered_content(self):
- target = dict()
- target["labels"] = ["foo"]
- target["extra_labels"] = ["morefoo"]
- target["features"] = ["bar"]
- target["components"] = ["baz"]
- target["macros"] = ["macbaz"]
- target["device_has"] = ["stuff"]
- target["core"] = ["core"]
- target["c_lib"] = ["c_lib"]
- target["printf_lib"] = ["printf_lib"]
- target["supported_form_factors"] = ["arduino"]
+
+ result = generate_mbed_config_cmake_file(mbed_target, fake_target, config, TOOLCHAIN_NAME)
+
+ assert result == _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, mbed_target,)
+
+
+class TestRendersCMakeListsFile:
+ def test_returns_rendered_content(self, fake_target):
config = ConfigFactory()
- toolchain_name = "baz"
- target["supported_c_libs"] = {toolchain_name.lower(): ["small", "std"]}
- target["supported_application_profiles"] = ["full", "bare-metal"]
- result = _render_mbed_config_cmake_template(target, config, toolchain_name, "target_name")
+ result = _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, "target_name")
- for label in target["labels"] + target["extra_labels"]:
- self.assertIn(label, result)
+ for label in fake_target["labels"] + fake_target["extra_labels"]:
+ assert label in result
- for macro in target["features"] + target["components"] + [toolchain_name]:
- self.assertIn(macro, result)
+ for macro in fake_target["features"] + fake_target["components"] + [TOOLCHAIN_NAME]:
+ assert macro in result
- for toolchain in target["supported_c_libs"]:
- self.assertIn(toolchain, result)
+ for toolchain in fake_target["supported_c_libs"]:
+ assert toolchain in result
for supported_c_libs in toolchain:
- self.assertIn(supported_c_libs, result)
+ assert supported_c_libs in result
+
+ for supported_application_profiles in fake_target["supported_application_profiles"]:
+ assert supported_application_profiles in result
+
+ def test_returns_quoted_content(self, fake_target):
+ config = ConfigFactory()
+ source = SourceFactory()
+
+ # Add an option whose value contains quotes to the config.
+ _create_config_option(config, "iotc-mqtt-host", '{"mqtt.2030.ltsapis.goog", IOTC_MQTT_PORT}', source)
- for supported_application_profiles in target["supported_application_profiles"]:
- self.assertIn(supported_application_profiles, result)
+ result = _render_mbed_config_cmake_template(fake_target, config, TOOLCHAIN_NAME, "target_name")
+ assert '"-DMBED_CONF_IOTC_MQTT_HOST={\\"mqtt.2030.ltsapis.goog\\", IOTC_MQTT_PORT}"' in result
|
mbed-tools fails to handle config options that contain quotes
### Description
From @rajkan01:
For the below mbed_lib.json config
```
"iotc-mqtt-host": {
"help": "IOTC MQTT host configuration. Defaults to mqtt.2030.ltsapis.goog host and port number 8883 if undefined",
"value": "{\"mqtt.2030.ltsapis.goog\", IOTC_MQTT_PORT}",
"macro_name": "IOTC_MQTT_HOST"
}
```
Mbedtools is generating `"-DIOTC_MQTT_HOST={"mqtt.2030.ltsapis.goog", IOTC_MQTT_PORT}"` config starts double-quotes from -D itself, and CMake prepossessing time this macro gets divided into multiple #define like below because of this define begin with double-quotes and also the value ("mqtt.2030.ltsapis.goog") with double-quote consider to be a string
```
#define IOTC_MQTT_HOST {
#define mqtt .2030.ltsapis.goog, IOTC_MQTT_PORT} 1
```
Could someone check this, why is the mbedtools generating macros starts with double-quotes which include `-D` and fix.
I've attached `main.ii` and `mbed_config.cmake`
[mbed_config.zip](https://github.com/ARMmbed/mbed-tools/files/5602300/mbed_config.zip)
### Issue request type
<!--
Please add only one `x` to one of the following types. Do not fill multiple types (split the issue otherwise).
For questions please use https://forums.mbed.com/
-->
- [ ] Enhancement
- [X] Bug
|
0.0
|
94a3bd761d6ab3305c81da93517767aafff58d7e
|
[
"tests/build/_internal/test_cmake_file.py::TestRendersCMakeListsFile::test_returns_quoted_content"
] |
[
"tests/build/_internal/test_cmake_file.py::TestGenerateCMakeListsFile::test_correct_arguments_passed",
"tests/build/_internal/test_cmake_file.py::TestRendersCMakeListsFile::test_returns_rendered_content"
] |
{
"failed_lite_validators": [
"has_hyperlinks",
"has_added_files"
],
"has_test_patch": true,
"is_lite": false
}
|
2020-12-01 14:33:04+00:00
|
apache-2.0
| 17 |
|
ARMmbed__mbed-tools-154
|
diff --git a/README.md b/README.md
index fdd2e05..eff3449 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,10 @@ follows:
## Installation
+`mbed-tools` relies on the Ninja build system and CMake.
+- CMake. [Install version 3.19.0 or newer for all operating systems](https://cmake.org/install/).
+- Ninja. [Install version 1.0 or newer for all operating systems](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages).
+
We recommend installing `mbed-tools` in a Python virtual environment to avoid dependency conflicts.
To install the most recent production quality release use:
diff --git a/news/20201210131204.bugfix b/news/20201210131204.bugfix
new file mode 100644
index 0000000..65ae014
--- /dev/null
+++ b/news/20201210131204.bugfix
@@ -0,0 +1,1 @@
+Emit more useful error messages if CMake or Ninja aren't found in PATH.
diff --git a/src/mbed_tools/build/build.py b/src/mbed_tools/build/build.py
index 66822bc..2334bc4 100644
--- a/src/mbed_tools/build/build.py
+++ b/src/mbed_tools/build/build.py
@@ -22,6 +22,7 @@ def build_project(build_dir: pathlib.Path, target: Optional[str] = None) -> None
build_dir: Path to the CMake build tree.
target: The CMake target to build (e.g 'install')
"""
+ _check_ninja_found()
target_flag = ["--target", target] if target is not None else []
_cmake_wrapper("--build", str(build_dir), *target_flag)
@@ -34,6 +35,7 @@ def generate_build_system(source_dir: pathlib.Path, build_dir: pathlib.Path, pro
build_dir: Path to the CMake build tree.
profile: The Mbed build profile (develop, debug or release).
"""
+ _check_ninja_found()
_cmake_wrapper("-S", str(source_dir), "-B", str(build_dir), "-GNinja", f"-DCMAKE_BUILD_TYPE={profile}")
@@ -41,5 +43,16 @@ def _cmake_wrapper(*cmake_args: str) -> None:
try:
logger.debug("Running CMake with args: %s", cmake_args)
subprocess.run(["cmake", *cmake_args], check=True)
+ except FileNotFoundError:
+ raise MbedBuildError("Could not find CMake. Please ensure CMake is installed and added to PATH.")
except subprocess.CalledProcessError:
raise MbedBuildError("CMake invocation failed!")
+
+
+def _check_ninja_found() -> None:
+ try:
+ subprocess.run(["ninja", "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ except FileNotFoundError:
+ raise MbedBuildError(
+ "Could not find the 'Ninja' build program. Please ensure 'Ninja' is installed and added to PATH."
+ )
|
ARMmbed/mbed-tools
|
9d6b2c71a7ddc93bd71279482a7572cac30ed745
|
diff --git a/tests/build/test_build.py b/tests/build/test_build.py
index b9d32af..5293966 100644
--- a/tests/build/test_build.py
+++ b/tests/build/test_build.py
@@ -2,45 +2,60 @@
# Copyright (C) 2020 Arm Mbed. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
-import pathlib
+import subprocess
-from tempfile import TemporaryDirectory
-from unittest import TestCase, mock
+from unittest import mock
+
+import pytest
from mbed_tools.build.build import build_project, generate_build_system
from mbed_tools.build.exceptions import MbedBuildError
-class TestBuildProject(TestCase):
- @mock.patch("mbed_tools.build.build._cmake_wrapper")
- def test_invokes_cmake_with_correct_args(self, cmake_wrapper):
+@pytest.fixture
+def subprocess_run():
+ with mock.patch("mbed_tools.build.build.subprocess.run", autospec=True) as subproc:
+ yield subproc
+
+
+class TestBuildProject:
+ def test_invokes_cmake_with_correct_args(self, subprocess_run):
build_project(build_dir="cmake_build", target="install")
- cmake_wrapper.assert_called_once_with("--build", "cmake_build", "--target", "install")
+ subprocess_run.assert_called_with(["cmake", "--build", "cmake_build", "--target", "install"], check=True)
- @mock.patch("mbed_tools.build.build._cmake_wrapper")
- def test_invokes_cmake_with_correct_args_if_no_target_passed(self, cmake_wrapper):
+ def test_invokes_cmake_with_correct_args_if_no_target_passed(self, subprocess_run):
build_project(build_dir="cmake_build")
- cmake_wrapper.assert_called_once_with("--build", "cmake_build")
+ subprocess_run.assert_called_with(["cmake", "--build", "cmake_build"], check=True)
- def test_raises_build_error_if_build_dir_doesnt_exist(self):
- with TemporaryDirectory() as tmp_dir:
- nonexistent_build_dir = pathlib.Path(tmp_dir, "cmake_build")
+ def test_raises_build_error_if_cmake_invocation_fails(self, subprocess_run):
+ subprocess_run.side_effect = (None, subprocess.CalledProcessError(1, ""))
- with self.assertRaises(MbedBuildError):
- build_project(nonexistent_build_dir)
+ with pytest.raises(MbedBuildError, match="CMake invocation failed"):
+ build_project(build_dir="cmake_build")
-@mock.patch("mbed_tools.build.build._cmake_wrapper")
-class TestConfigureProject(TestCase):
- def test_invokes_cmake_with_correct_args(self, cmake_wrapper):
+class TestConfigureProject:
+ def test_invokes_cmake_with_correct_args(self, subprocess_run):
source_dir = "source_dir"
build_dir = "cmake_build"
profile = "debug"
generate_build_system(source_dir, build_dir, profile)
- cmake_wrapper.assert_called_once_with(
- "-S", source_dir, "-B", build_dir, "-GNinja", f"-DCMAKE_BUILD_TYPE={profile}"
+ subprocess_run.assert_called_with(
+ ["cmake", "-S", source_dir, "-B", build_dir, "-GNinja", f"-DCMAKE_BUILD_TYPE={profile}"], check=True
)
+
+ def test_raises_when_ninja_cannot_be_found(self, subprocess_run):
+ subprocess_run.side_effect = FileNotFoundError
+
+ with pytest.raises(MbedBuildError, match="Ninja"):
+ generate_build_system("", "", "")
+
+ def test_raises_when_cmake_cannot_be_found(self, subprocess_run):
+ subprocess_run.side_effect = (None, FileNotFoundError)
+
+ with pytest.raises(MbedBuildError, match="Could not find CMake"):
+ generate_build_system("", "", "")
|
README.md : miss cmake and ninja information
### Description
Hi
This morning, I spent some time on a new PC to install this new mbed tool,
This was not working, and I got several not friendly messages...
... till I remembered that I didn't install cmake yet...
So my request would be:
- to update tools when cmake is not installed with some friendly message "please install cmake"
- same for ninja
- to update README.md to add information how to install cmake and ninja
Thx
@0xc0170
@MarceloSalazar
@JeanMarcR
### Issue request type
<!--
Please add only one `x` to one of the following types. Do not fill multiple types (split the issue otherwise).
For questions please use https://forums.mbed.com/
-->
- [x] Enhancement
- [ ] Bug
|
0.0
|
9d6b2c71a7ddc93bd71279482a7572cac30ed745
|
[
"tests/build/test_build.py::TestBuildProject::test_raises_build_error_if_cmake_invocation_fails",
"tests/build/test_build.py::TestConfigureProject::test_raises_when_ninja_cannot_be_found",
"tests/build/test_build.py::TestConfigureProject::test_raises_when_cmake_cannot_be_found"
] |
[
"tests/build/test_build.py::TestBuildProject::test_invokes_cmake_with_correct_args",
"tests/build/test_build.py::TestBuildProject::test_invokes_cmake_with_correct_args_if_no_target_passed",
"tests/build/test_build.py::TestConfigureProject::test_invokes_cmake_with_correct_args"
] |
{
"failed_lite_validators": [
"has_hyperlinks",
"has_added_files",
"has_many_modified_files",
"has_many_hunks",
"has_pytest_match_arg"
],
"has_test_patch": true,
"is_lite": false
}
|
2020-12-10 13:15:11+00:00
|
apache-2.0
| 18 |
|
ARMmbed__mbed-tools-190
|
diff --git a/news/169.bugfix b/news/169.bugfix
new file mode 100644
index 0000000..78b6135
--- /dev/null
+++ b/news/169.bugfix
@@ -0,0 +1,1 @@
+Support use of user@host:directory syntax with the import subcommand.
diff --git a/src/mbed_tools/project/mbed_program.py b/src/mbed_tools/project/mbed_program.py
index d095e5b..c3a9536 100644
--- a/src/mbed_tools/project/mbed_program.py
+++ b/src/mbed_tools/project/mbed_program.py
@@ -113,6 +113,9 @@ def parse_url(name_or_url: str) -> Dict[str, str]:
url_obj = urlparse(name_or_url)
if url_obj.hostname:
url = url_obj.geturl()
+ elif ":" in name_or_url.split("/", maxsplit=1)[0]:
+ # If non-standard and no slashes before first colon, git will recognize as scp ssh syntax
+ url = name_or_url
else:
url = f"https://github.com/armmbed/{url_obj.path}"
# We need to create a valid directory name from the url path section.
|
ARMmbed/mbed-tools
|
d4dd48ce58952851f9cb2a9e98b0f788a61a23a3
|
diff --git a/tests/project/test_mbed_program.py b/tests/project/test_mbed_program.py
index 7f700f0..be83aa9 100644
--- a/tests/project/test_mbed_program.py
+++ b/tests/project/test_mbed_program.py
@@ -127,6 +127,12 @@ class TestParseURL(TestCase):
self.assertEqual(data["url"], url)
self.assertEqual(data["dst_path"], "mbed-os-example-numskull")
+ def test_creates_valid_dst_dir_from_ssh_url(self):
+ url = "git@superversioncontrol:superorg/mbed-os-example-numskull"
+ data = parse_url(url)
+ self.assertEqual(data["url"], url)
+ self.assertEqual(data["dst_path"], "mbed-os-example-numskull")
+
class TestFindProgramRoot(TestCase):
@patchfs
|
mbed-tools import fails to import an example with ssh url
### Description
<!--
A detailed description of what is being reported. Please include steps to reproduce the problem.
Things to consider sharing:
- What version of the package is being used (pip show mbed-tools)?
- What is the host platform and version (e.g. macOS 10.15.2, Windows 10, Ubuntu 18.04 LTS)?
-->
mbed-tools version: **5.0.0**
Command:
`mbed-tools -vv import git@github.com:ARMmbed/mbed-os-example-blinky.git`
Expected:
mbed-os-example-blinky example cloned onto a local machine.
Output:
```
Cloning Mbed program 'git@github.com:ARMmbed/mbed-os-example-blinky.git'
Resolving program library dependencies.
ERROR: Cloning git repository from url 'https://github.com/armmbed/git@github.com:ARMmbed/mbed-os-example-blinky.git' failed. Error from VCS: Cmd('git') failed due to: exit code(128)
cmdline: git clone --progress -v https://github.com/armmbed/git@github.com:ARMmbed/mbed-os-example-blinky.git mbed-os-example-blinky.git
More information may be available by using the command line option '-vvv'.
```
### Issue request type
<!--
Please add only one `x` to one of the following types. Do not fill multiple types (split the issue otherwise).
For questions please use https://forums.mbed.com/
-->
- [ ] Enhancement
- [x] Bug
|
0.0
|
d4dd48ce58952851f9cb2a9e98b0f788a61a23a3
|
[
"tests/project/test_mbed_program.py::TestParseURL::test_creates_valid_dst_dir_from_ssh_url"
] |
[
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_raises_if_no_mbed_os_dir_found_and_check_mbed_os_is_true",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_raises_if_path_is_not_a_program",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_returns_valid_program",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_existing_with_mbed_os_path_returns_valid_program",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_creating_directory",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_creating_directory_in_cwd",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_generates_valid_program_existing_directory",
"tests/project/test_mbed_program.py::TestInitialiseProgram::test_from_new_local_dir_raises_if_path_is_existing_program",
"tests/project/test_mbed_program.py::TestParseURL::test_creates_url_and_dst_dir_from_name",
"tests/project/test_mbed_program.py::TestParseURL::test_creates_valid_dst_dir_from_url",
"tests/project/test_mbed_program.py::TestFindProgramRoot::test_finds_program_at_current_path",
"tests/project/test_mbed_program.py::TestFindProgramRoot::test_finds_program_higher_in_dir_tree",
"tests/project/test_mbed_program.py::TestFindProgramRoot::test_raises_if_no_program_found"
] |
{
"failed_lite_validators": [
"has_hyperlinks",
"has_added_files"
],
"has_test_patch": true,
"is_lite": false
}
|
2021-02-15 13:43:30+00:00
|
apache-2.0
| 19 |
|
ARMmbed__mbed-tools-196
|
diff --git a/news/20210218112043.bugfix b/news/20210218112043.bugfix
new file mode 100644
index 0000000..f595eac
--- /dev/null
+++ b/news/20210218112043.bugfix
@@ -0,0 +1,1 @@
+Raise a nicer error from mbed-tools detect when running on an unrecognised OS.
diff --git a/src/mbed_tools/devices/_internal/detect_candidate_devices.py b/src/mbed_tools/devices/_internal/detect_candidate_devices.py
index 7078c4f..418cbc2 100644
--- a/src/mbed_tools/devices/_internal/detect_candidate_devices.py
+++ b/src/mbed_tools/devices/_internal/detect_candidate_devices.py
@@ -8,6 +8,7 @@ from typing import Iterable
from mbed_tools.devices._internal.candidate_device import CandidateDevice
from mbed_tools.devices._internal.base_detector import DeviceDetector
+from mbed_tools.devices.exceptions import UnknownOSError
def detect_candidate_devices() -> Iterable[CandidateDevice]:
@@ -26,7 +27,12 @@ def _get_detector_for_current_os() -> DeviceDetector:
from mbed_tools.devices._internal.linux.device_detector import LinuxDeviceDetector
return LinuxDeviceDetector()
- else:
+ if platform.system() == "Darwin":
from mbed_tools.devices._internal.darwin.device_detector import DarwinDeviceDetector
return DarwinDeviceDetector()
+
+ raise UnknownOSError(
+ f"We have detected the OS you are running is '{platform.system()}'. "
+ "Unfortunately we haven't implemented device detection support for this OS yet. Sorry!"
+ )
diff --git a/src/mbed_tools/devices/exceptions.py b/src/mbed_tools/devices/exceptions.py
index 4763b88..570941d 100644
--- a/src/mbed_tools/devices/exceptions.py
+++ b/src/mbed_tools/devices/exceptions.py
@@ -16,3 +16,7 @@ class DeviceLookupFailed(MbedDevicesError):
class NoDevicesFound(MbedDevicesError):
"""No Mbed Enabled devices were found."""
+
+
+class UnknownOSError(MbedDevicesError):
+ """The current OS is not supported."""
|
ARMmbed/mbed-tools
|
fe56531239ba0a1cbe2ce696f00f9b58889f05bc
|
diff --git a/tests/devices/_internal/test_detect_candidate_devices.py b/tests/devices/_internal/test_detect_candidate_devices.py
index 75c5032..74137b3 100644
--- a/tests/devices/_internal/test_detect_candidate_devices.py
+++ b/tests/devices/_internal/test_detect_candidate_devices.py
@@ -2,39 +2,49 @@
# Copyright (c) 2020-2021 Arm Limited and Contributors. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
-from unittest import TestCase, mock
+import pytest
+from unittest import mock
from tests.devices.markers import windows_only, darwin_only, linux_only
from mbed_tools.devices._internal.base_detector import DeviceDetector
+from mbed_tools.devices.exceptions import UnknownOSError
from mbed_tools.devices._internal.detect_candidate_devices import (
detect_candidate_devices,
_get_detector_for_current_os,
)
-class TestDetectCandidateDevices(TestCase):
+class TestDetectCandidateDevices:
@mock.patch("mbed_tools.devices._internal.detect_candidate_devices._get_detector_for_current_os")
def test_returns_candidates_using_os_specific_detector(self, _get_detector_for_current_os):
detector = mock.Mock(spec_set=DeviceDetector)
_get_detector_for_current_os.return_value = detector
- self.assertEqual(detect_candidate_devices(), detector.find_candidates.return_value)
+ assert detect_candidate_devices() == detector.find_candidates.return_value
-class TestGetDetectorForCurrentOS(TestCase):
+class TestGetDetectorForCurrentOS:
@windows_only
def test_windows_uses_correct_module(self):
from mbed_tools.devices._internal.windows.device_detector import WindowsDeviceDetector
- self.assertIsInstance(_get_detector_for_current_os(), WindowsDeviceDetector)
+ assert isinstance(_get_detector_for_current_os(), WindowsDeviceDetector)
@darwin_only
def test_darwin_uses_correct_module(self):
from mbed_tools.devices._internal.darwin.device_detector import DarwinDeviceDetector
- self.assertIsInstance(_get_detector_for_current_os(), DarwinDeviceDetector)
+ assert isinstance(_get_detector_for_current_os(), DarwinDeviceDetector)
@linux_only
def test_linux_uses_correct_module(self):
from mbed_tools.devices._internal.linux.device_detector import LinuxDeviceDetector
- self.assertIsInstance(_get_detector_for_current_os(), LinuxDeviceDetector)
+ assert isinstance(_get_detector_for_current_os(), LinuxDeviceDetector)
+
+ @mock.patch("platform.system")
+ def test_raises_when_os_is_unknown(self, platform_system):
+ os_name = "SomethingNobodyUses"
+ platform_system.return_value = os_name
+
+ with pytest.raises(UnknownOSError):
+ _get_detector_for_current_os()
|
BSD: `mbed-tools detect` causes Python stack trace from mbed_tools/devices
### Description
Desired behavior:
- `mbed-tools detect` lists out USB-connected boards, or a friendly message if it can't
Actual behavior:
- `mbed-tools detect` causes a Python stack trace to be printed
```
[mbedtools] patater@example.com:~ % mbed-tools detect
Traceback (most recent call last):
File "/home/patater/venvs/mbedtools/bin/mbed-tools", line 8, in <module>
sys.exit(cli())
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py", line 829, in __call__
return self.main(*args, **kwargs)
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py", line 782, in main
rv = self.invoke(ctx)
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/cli/main.py", line 38, in invoke
super().invoke(context)
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py", line 1259, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py", line 1066, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/click/core.py", line 610, in invoke
return callback(*args, **kwargs)
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/cli/list_connected_devices.py", line 29, in list_connected_devices
connected_devices = get_connected_devices()
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/devices.py", line 32, in get_connected_devices
for candidate_device in detect_candidate_devices():
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/detect_candidate_devices.py", line 16, in detect_candidate_devices
return detector.find_candidates()
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/darwin/device_detector.py", line 40, in find_candidates
usb_devices_data = system_profiler.get_end_usb_devices_data()
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/darwin/system_profiler.py", line 42, in get_end_usb_devices_data
data = get_all_usb_devices_data()
File "/home/patater/venvs/mbedtools/lib/python3.7/site-packages/mbed_tools/devices/_internal/darwin/system_profiler.py", line 34, in get_all_usb_devices_data
output = subprocess.check_output(["system_profiler", "-xml", "SPUSBDataType"], stderr=subprocess.DEVNULL)
File "/usr/local/lib/python3.7/subprocess.py", line 411, in check_output
**kwargs).stdout
File "/usr/local/lib/python3.7/subprocess.py", line 488, in run
with Popen(*popenargs, **kwargs) as process:
File "/usr/local/lib/python3.7/subprocess.py", line 800, in __init__
restore_signals, start_new_session)
File "/usr/local/lib/python3.7/subprocess.py", line 1551, in _execute_child
raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'system_profiler': 'system_profiler'
```
It looks like something called `darwin/device_detector.py` is being used, but my host OS is not Darwin or macOS. It's just your friendly, neighborhood FreeBSD. I'd guess the OS detection is not very sophisticated.
```
[mbedtools] patater@example.com:~ % mbed-tools --version
5.4.0
```
### Issue request type
- [ ] Enhancement
- [X] Bug
|
0.0
|
fe56531239ba0a1cbe2ce696f00f9b58889f05bc
|
[
"tests/devices/_internal/test_detect_candidate_devices.py::TestDetectCandidateDevices::test_returns_candidates_using_os_specific_detector",
"tests/devices/_internal/test_detect_candidate_devices.py::TestGetDetectorForCurrentOS::test_linux_uses_correct_module",
"tests/devices/_internal/test_detect_candidate_devices.py::TestGetDetectorForCurrentOS::test_raises_when_os_is_unknown"
] |
[] |
{
"failed_lite_validators": [
"has_added_files",
"has_many_modified_files"
],
"has_test_patch": true,
"is_lite": false
}
|
2021-02-18 11:23:15+00:00
|
apache-2.0
| 20 |
|
ARMmbed__mbed-tools-270
|
diff --git a/news/222.bugfix b/news/222.bugfix
new file mode 100644
index 0000000..4bb5df6
--- /dev/null
+++ b/news/222.bugfix
@@ -0,0 +1,1 @@
+Add support for MBED_ROM_START, MBED_ROM_SIZE, MBED_RAM_START and MBED_RAM_SIZE in config system.
diff --git a/src/mbed_tools/build/_internal/config/config.py b/src/mbed_tools/build/_internal/config/config.py
index d93cfe4..bb493f2 100644
--- a/src/mbed_tools/build/_internal/config/config.py
+++ b/src/mbed_tools/build/_internal/config/config.py
@@ -8,7 +8,7 @@ import logging
from collections import UserDict
from typing import Any, Iterable, Hashable, Callable, List
-from mbed_tools.build._internal.config.source import Override, ConfigSetting
+from mbed_tools.build._internal.config.source import Memory, Override, ConfigSetting
logger = logging.getLogger(__name__)
@@ -18,13 +18,15 @@ class Config(UserDict):
This object understands how to populate the different 'config sections' which all have different rules for how the
settings are collected.
- Applies overrides, appends macros and updates config settings.
+ Applies overrides, appends macros, updates memories, and updates config settings.
"""
def __setitem__(self, key: Hashable, item: Any) -> None:
"""Set an item based on its key."""
if key == CONFIG_SECTION:
self._update_config_section(item)
+ elif key == MEMORIES_SECTION:
+ self._update_memories_section(item)
elif key == OVERRIDES_SECTION:
self._handle_overrides(item)
elif key == MACROS_SECTION:
@@ -67,6 +69,20 @@ class Config(UserDict):
self.data[CONFIG_SECTION] = self.data.get(CONFIG_SECTION, []) + config_settings
+ def _update_memories_section(self, memories: List[Memory]) -> None:
+ defined_memories = self.data.get(MEMORIES_SECTION, [])
+ for memory in memories:
+ logger.debug(f"Adding memory settings `{memory.name}: start={memory.start} size={memory.size}`")
+ prev_defined = next((mem for mem in defined_memories if mem.name == memory.name), None)
+ if prev_defined is None:
+ defined_memories.append(memory)
+ else:
+ logger.warning(
+ f"You are attempting to redefine `{memory.name}` from {prev_defined.namespace}.\n"
+ f"The values from `{memory.namespace}` will be ignored"
+ )
+ self.data[MEMORIES_SECTION] = defined_memories
+
def _find_first_config_setting(self, predicate: Callable) -> Any:
"""Find first config setting based on `predicate`.
@@ -89,6 +105,7 @@ class Config(UserDict):
CONFIG_SECTION = "config"
MACROS_SECTION = "macros"
+MEMORIES_SECTION = "memories"
OVERRIDES_SECTION = "overrides"
diff --git a/src/mbed_tools/build/_internal/config/source.py b/src/mbed_tools/build/_internal/config/source.py
index 4ad7e37..59d01df 100644
--- a/src/mbed_tools/build/_internal/config/source.py
+++ b/src/mbed_tools/build/_internal/config/source.py
@@ -28,8 +28,8 @@ def prepare(
) -> dict:
"""Prepare a config source for entry into the Config object.
- Extracts config and override settings from the source. Flattens these nested dictionaries out into lists of
- objects which are namespaced in the way the Mbed config system expects.
+ Extracts memory, config and override settings from the source. Flattens these nested dictionaries out into
+ lists of objects which are namespaced in the way the Mbed config system expects.
Args:
input_data: The raw config JSON object parsed from the config file.
@@ -46,6 +46,11 @@ def prepare(
for key in data:
data[key] = _sanitise_value(data[key])
+ memories = _extract_memories(namespace, data)
+
+ if memories:
+ data["memories"] = memories
+
if "config" in data:
data["config"] = _extract_config_settings(namespace, data["config"])
@@ -78,6 +83,31 @@ class ConfigSetting:
self.value = _sanitise_value(self.value)
+@dataclass
+class Memory:
+ """Representation of a defined RAM/ROM region."""
+
+ name: str
+ namespace: str
+ start: str
+ size: str
+
+ def __post_init__(self) -> None:
+ """Convert start and size to hex format strings."""
+ try:
+ self.start = hex(int(self.start, 0))
+ except ValueError:
+ raise ValueError(
+ f"Value of MBED_{self.name}_START in {self.namespace}, {self.start} is invalid: must be an integer"
+ )
+ try:
+ self.size = hex(int(self.size, 0))
+ except ValueError:
+ raise ValueError(
+ f"Value of MBED_{self.name}_SIZE in {self.namespace}, {self.size} is invalid: must be an integer"
+ )
+
+
@dataclass
class Override:
"""Representation of a config override.
@@ -128,6 +158,27 @@ def _extract_config_settings(namespace: str, config_data: dict) -> List[ConfigSe
return settings
+def _extract_memories(namespace: str, data: dict) -> List[Memory]:
+ memories = []
+ for mem in ["rom", "ram"]:
+ start_attr = f"mbed_{mem}_start"
+ size_attr = f"mbed_{mem}_size"
+ start = data.get(start_attr)
+ size = data.get(size_attr)
+
+ if size is not None and start is not None:
+ logger.debug(f"Extracting MBED_{mem.upper()} definitions in {namespace}: _START={start}, _SIZE={size}.")
+
+ memory = Memory(mem.upper(), namespace, start, size)
+ memories.append(memory)
+ elif start is not None or size is not None:
+ raise ValueError(
+ f"{size_attr.upper()} and {start_attr.upper()} must be defined together. Only "
+ f"{'START' if start is not None else 'SIZE'} is defined in the lib {namespace}."
+ )
+ return memories
+
+
def _extract_target_overrides(
namespace: str, override_data: dict, allowed_target_labels: Iterable[str]
) -> List[Override]:
diff --git a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl
index 8fb2119..7fadeb1 100644
--- a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl
+++ b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl
@@ -75,6 +75,10 @@ set(MBED_CONFIG_DEFINITIONS
"-D{{setting_name}}={{value}}"
{% endif -%}
{%- endfor -%}
+{% for memory in memories %}
+ "-DMBED_{{memory.name}}_START={{memory.start}}"
+ "-DMBED_{{memory.name}}_SIZE={{memory.size}}"
+{%- endfor -%}
{% for macro in macros %}
"{{macro|replace("\"", "\\\"")}}"
{%- endfor %}
|
ARMmbed/mbed-tools
|
73fc6ed6fd728beea588e100c2de83c439c29228
|
diff --git a/tests/build/_internal/config/test_config.py b/tests/build/_internal/config/test_config.py
index 980ed4d..c7e2e35 100644
--- a/tests/build/_internal/config/test_config.py
+++ b/tests/build/_internal/config/test_config.py
@@ -2,10 +2,11 @@
# Copyright (c) 2020-2021 Arm Limited and Contributors. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
+import logging
import pytest
from mbed_tools.build._internal.config.config import Config
-from mbed_tools.build._internal.config.source import prepare, ConfigSetting, Override
+from mbed_tools.build._internal.config.source import prepare, ConfigSetting, Memory, Override
class TestConfig:
@@ -24,6 +25,17 @@ class TestConfig:
with pytest.raises(ValueError, match="lib.param already defined"):
conf.update(prepare({"config": {"param": {"value": 0}}}, source_name="lib"))
+ def test_logs_ignore_mbed_ram_repeated(self, caplog):
+ caplog.set_level(logging.DEBUG)
+ input_dict = {"mbed_ram_size": "0x80000", "mbed_ram_start": "0x24000000"}
+ input_dict2 = {"mbed_ram_size": "0x78000", "mbed_ram_start": "0x24200000"}
+
+ conf = Config(prepare(input_dict, source_name="lib1"))
+ conf.update(prepare(input_dict2, source_name="lib2"))
+
+ assert "values from `lib2` will be ignored" in caplog.text
+ assert conf["memories"] == [Memory("RAM", "lib1", "0x24000000", "0x80000")]
+
def test_target_overrides_handled(self):
conf = Config(
{
diff --git a/tests/build/_internal/config/test_source.py b/tests/build/_internal/config/test_source.py
index 962315a..b7f4a2a 100644
--- a/tests/build/_internal/config/test_source.py
+++ b/tests/build/_internal/config/test_source.py
@@ -2,8 +2,10 @@
# Copyright (c) 2020-2021 Arm Limited and Contributors. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
+import pytest
+
from mbed_tools.build._internal.config import source
-from mbed_tools.build._internal.config.source import Override
+from mbed_tools.build._internal.config.source import Memory, Override
class TestPrepareSource:
@@ -118,3 +120,48 @@ class TestPrepareSource:
assert conf["config"][0].value == {"ETHERNET", "WIFI"}
assert conf["sectors"] == {0, 2048}
assert conf["header_info"] == {0, 2048, "bobbins", "magic"}
+
+ def test_memory_attr_extracted(self):
+ lib = {
+ "mbed_ram_size": "0x80000",
+ "mbed_ram_start": "0x24000000",
+ "mbed_rom_size": "0x200000",
+ "mbed_rom_start": "0x08000000",
+ }
+
+ conf = source.prepare(lib, "lib")
+
+ assert Memory("RAM", "lib", "0x24000000", "0x80000") in conf["memories"]
+ assert Memory("ROM", "lib", "0x8000000", "0x200000") in conf["memories"]
+
+ def test_memory_attr_converted_as_hex(self):
+ input_dict = {"mbed_ram_size": "1024", "mbed_ram_start": "0x24000000"}
+
+ conf = source.prepare(input_dict, source_name="lib")
+
+ memory, *_ = conf["memories"]
+ assert memory.size == "0x400"
+
+ def test_raises_memory_size_not_integer(self):
+ input_dict = {"mbed_ram_size": "NOT INT", "mbed_ram_start": "0x24000000"}
+
+ with pytest.raises(ValueError, match="_SIZE in lib, NOT INT is invalid: must be an integer"):
+ source.prepare(input_dict, "lib")
+
+ def test_raises_memory_start_not_integer(self):
+ input_dict = {"mbed_ram_size": "0x80000", "mbed_ram_start": "NOT INT"}
+
+ with pytest.raises(ValueError, match="_START in lib, NOT INT is invalid: must be an integer"):
+ source.prepare(input_dict, "lib")
+
+ def test_raises_memory_size_defined_not_start(self):
+ input_dict = {"mbed_ram_size": "0x80000"}
+
+ with pytest.raises(ValueError, match="Only SIZE is defined"):
+ source.prepare(input_dict)
+
+ def test_raises_memory_start_defined_not_size(self):
+ input_dict = {"mbed_ram_start": "0x24000000"}
+
+ with pytest.raises(ValueError, match="Only START is defined"):
+ source.prepare(input_dict)
|
MBED_ROM_START and friends unavailable on Mbed CLI2
### Description
<!--
A detailed description of what is being reported. Please include steps to reproduce the problem.
Things to consider sharing:
- What version of the package is being used (pip show mbed-tools)?
- What is the host platform and version (e.g. macOS 10.15.2, Windows 10, Ubuntu 18.04 LTS)?
-->
On Mbed CLI, the following symbols are generated and passed to compiler, linker, or both:
```sh
mbed compile -m NUMAKER_IOT_M487 -t ARM
```
**BUILD/NUMAKER_IOT_M487/ARM/.profile.c**:
```
{
"flags": [
......
"-DMBED_RAM_SIZE=0x28000",
"-DMBED_RAM_START=0x20000000",
"-DMBED_ROM_SIZE=0x80000",
"-DMBED_ROM_START=0x0",
......
```
**BUILD/NUMAKER_IOT_M487/ARM/.profile.ld**:
```
{
"flags": [
......
"--predefine=\"-DMBED_BOOT_STACK_SIZE=1024\"",
"--predefine=\"-DMBED_RAM_SIZE=0x28000\"",
"--predefine=\"-DMBED_RAM_START=0x20000000\"",
"--predefine=\"-DMBED_ROM_SIZE=0x80000\"",
"--predefine=\"-DMBED_ROM_START=0x0\"",
......
```
But on Mbed CLI2, they are unavailable in `cmake_build/NUMAKER_IOT_M487/develop/ARM/mbed_config.cmake` or elsewhere.
```sh
mbed-tools compile -m NUMAKER_IOT_M487 -t ARM
```
### Issue request type
<!--
Please add only one `x` to one of the following types. Do not fill multiple types (split the issue otherwise).
For questions please use https://forums.mbed.com/
-->
- [ ] Enhancement
- [x] Bug
### Mbed/Tool version
**mbed-os**: 6.8.0
**mbed-cli**: 1.10.5
**mbed-tools**:: 7.2.1
|
0.0
|
73fc6ed6fd728beea588e100c2de83c439c29228
|
[
"tests/build/_internal/config/test_config.py::TestConfig::test_target_overrides_separate_namespace",
"tests/build/_internal/config/test_config.py::TestConfig::test_target_overrides_handled",
"tests/build/_internal/config/test_config.py::TestConfig::test_macros_are_appended_to",
"tests/build/_internal/config/test_config.py::TestConfig::test_raises_when_trying_to_add_duplicate_config_setting",
"tests/build/_internal/config/test_config.py::TestConfig::test_warns_and_skips_override_for_undefined_config_parameter",
"tests/build/_internal/config/test_config.py::TestConfig::test_config_updated",
"tests/build/_internal/config/test_config.py::TestConfig::test_logs_ignore_mbed_ram_repeated",
"tests/build/_internal/config/test_config.py::TestConfig::test_lib_overrides_handled",
"tests/build/_internal/config/test_config.py::TestConfig::test_cumulative_fields_can_be_modified",
"tests/build/_internal/config/test_config.py::TestConfig::test_ignores_present_option",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_size_defined_not_start",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_start_defined_not_size",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_memory_attr_extracted",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_override_fields_from_lib_are_namespaced",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_start_not_integer",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_override_fields_from_target_are_namespaced",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_target_overrides_only_collected_for_valid_targets",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_memory_attr_converted_as_hex",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_cumulative_fields_parsed",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_raises_memory_size_not_integer",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_config_fields_from_lib_are_namespaced",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_config_fields_from_target_are_namespaced",
"tests/build/_internal/config/test_source.py::TestPrepareSource::test_converts_config_setting_value_lists_to_sets"
] |
[] |
{
"failed_lite_validators": [
"has_hyperlinks",
"has_added_files",
"has_many_modified_files",
"has_many_hunks",
"has_pytest_match_arg"
],
"has_test_patch": true,
"is_lite": false
}
|
2021-04-13 11:28:54+00:00
|
apache-2.0
| 21 |
End of preview. Expand
in Data Studio
Note: This dataset has an improved and significantly larger successor: SWE-rebench.
Dataset Summary
SWE-bench Extra is a dataset that can be used to train or evaluate agentic systems specializing in resolving GitHub issues. It is based on the methodology used to build SWE-bench benchmark and includes 6,415 Issue-Pull Request pairs sourced from 1,988 Python repositories.
Dataset Description
The SWE-bench Extra dataset supports the development of software engineering agents capable of autonomously solving GitHub issues. The data collection process, based on the SWE-bench methodology, involves the following steps:
- Issue and Pull Request Collection: Issues are gathered and linked with pull requests that successfully resolve them.
- Filtering: Instances are filtered based on attributes such as issue descriptions, relevant code paths, and test patches.
- Execution-based Validation: The project environments are set up and tests are run to verify that they execute correctly.
For a more detailed description of the data collection process, please refer to our blog post Scaling data collection for training software engineering agents.
As an example use case of this dataset, we’ve used SWE-bench-extra instances to generate a dataset of 80,036 trajectories nebius/swe-agent-trajectories. We’ve then trained an action generator model, that achieves a score of 19.2% on the subset of 50 random instances from the SWE-bench Verified benchmark, representing a 30% relative improvement over its parent model Qwen2.5-72B-Instruct, which scored 14.8%. Further augmenting the action generator with a guided search based on a critic model, also trained on this data, achieves 40.6% on the full SWE-bench Verified benchmark, which is state-of-the-art among agents using solely open-weight models. You can read more about this agent in our blog post, “Leveraging Training and Search for Better Software Engineering Agents”.
How to Use
from datasets import load_dataset
ds = load_dataset('nebius/SWE-bench-extra')
Dataset Statistics
Average, 75th percentile, and maximum values characterizing various attributes of the collected instances. Statistics are micro-averaged without grouping by repository.
| Data | Type | Mean | p75 | Max |
|---|---|---|---|---|
| Issue text | Length (words) | 111.5 | 146 | 1,294 |
| Code base | Files (Non-test) | 71.71 | 72.00 | 2,264 |
| Lines (Non-test) | 15,163.38 | 13,777 | 1,039,288 | |
| Gold patch | Files edited | 2.6 | 3 | 7 |
| Lines edited | 56 | 76 | 300 | |
| Tests | Fail to Pass | 10.94 | 5 | 4,941 |
| Total | 58.5 | 49 | 7,820 |
Dataset Structure
The dataset contains the following fields. It includes all fields from SWE-bench and adds a meta column, which indicates whether the instance meets the "lite" criteria and, if not, lists the failed validators.
| Field name | Type | Description |
|---|---|---|
instance_id |
str | A formatted instance identifier, usually as repo_owner__repo_name-PR-number. |
patch |
str | The gold patch, the patch generated by the PR (minus test-related code), that resolved the issue. |
repo |
str | The repository owner/name identifier from GitHub. |
base_commit |
str | The commit hash of the repository representing the HEAD of the repository before the solution PR is applied. |
hints_text |
str | Comments made on the issue prior to the creation of the solution PR’s first commit creation date. |
created_at |
str | The creation date of the pull request. |
test_patch |
str | A test-file patch that was contributed by the solution PR. |
problem_statement |
str | The issue title and body. |
version |
str | Installation version to use for running evaluation. |
environment_setup_commit |
str | Commit hash to use for environment setup and installation. |
FAIL_TO_PASS |
str | A JSON list of strings that represent the set of tests resolved by the PR and tied to the issue resolution. |
PASS_TO_PASS |
str | A JSON list of strings that represent tests that should pass before and after the PR application. |
meta |
str | A JSON dictionary indicating whether the instance is lite, along with a list of failed lite validators if it is not. |
license |
str | The type of license of the repository. |
To execute instances within SWE-bench, you need to provide a default recipe for dependency installation. The constants required for running these instances are described in this constants.py.
License
The dataset is licensed under the Creative Commons Attribution 4.0 license. However, please respect the license of each specific repository on which a particular instance is based. To facilitate this, the license of each repository at the time of the commit is provided for every instance.
- Downloads last month
- 164