(\\s*\\{\\#)))')\n@@ -63,31 +67,14 @@ def end_pat(self):\n )))\n \n \n-TAG_CLOSE_PATTERN = regex(r'(?:(?P<tag_close>(\\-\\%\\}\\s*|\\%\\})))')\n-# if you do {% materialization foo, adapter=\"myadapter' %} and end up with\n-# mismatched quotes this will still match, but jinja will fail somewhere\n-# since the adapter= argument has to be an adapter name, and none have quotes\n-# or anything else in them. So this should be fine.\n-MATERIALIZATION_ARGS_PATTERN = regex(\n- r'\\s*,\\s*'\n- r'''(?P<adpater_arg>(adapter=(?:['\"]{}['\"])|default))'''\n- .format(_NAME_PATTERN)\n-)\n-# macros an stuff like macros get open parents, followed by a very complicated\n-# argument spec! In fact, it's easiest to parse it in tiny little chunks\n-# because we have to handle awful stuff like string parsing ;_;\n-MACRO_ARGS_START_PATTERN = regex(r'\\s*(?P<macro_start>\\()\\s*')\n-MACRO_ARGS_END_PATTERN = regex(r'\\s*(?P<macro_end>(\\)))\\s*')\n-\n-# macros can be like {% macro foo(bar) %} or {% macro foo(bar, baz) %} or\n-# {% macro foo(bar, baz=\"quux\") %} or ...\n-# I think jinja disallows default values after required (like Python), but we\n-# can ignore that and let jinja deal\n-MACRO_ARG_PATTERN = regex(''.join((\n- r'\\s*(?P<macro_arg_name>({}))\\s*',\n- r'((?P<value>=)|(?P<more_args>,)?)\\s*'.format(_NAME_PATTERN),\n+RAW_BLOCK_PATTERN = regex(''.join((\n+ r'(?:\\s*\\{\\%\\-|\\{\\%)\\s*raw\\s*(?:\\-\\%\\}\\s*|\\%\\})',\n+ r'(?:.*)',\n+ r'(?:\\s*\\{\\%\\-|\\{\\%)\\s*endraw\\s*(?:\\-\\%\\}\\s*|\\%\\})',\n )))\n \n+TAG_CLOSE_PATTERN = regex(r'(?:(?P<tag_close>(\\-\\%\\}\\s*|\\%\\})))')\n+\n # stolen from jinja's lexer. Note that we've consumed all prefix whitespace by\n # the time we want to use this.\n STRING_PATTERN = regex(\n@@ -97,26 +84,8 @@ def end_pat(self):\n \n QUOTE_START_PATTERN = regex(r'''(?P<quote>(['\"]))''')\n \n-# any number of non-quote characters, followed by:\n-# - quote: a quote mark indicating start of a string (you'll want to backtrack\n-# the regex end on quotes and then match with the string pattern)\n-# - a comma (so there will be another full argument)\n-# - a closing parenthesis (you can now expect a closing tag)\n-NON_STRING_MACRO_ARGS_PATTERN = regex(\n- # anything, followed by a quote, open/close paren, or comma\n- r'''(.*?)'''\n- r'''((?P<quote>(['\"]))|(?P<open>(\\())|(?P<close>(\\)))|(?P<comma>(\\,)))'''\n-)\n-\n-\n-NON_STRING_DO_BLOCK_MEMBER_PATTERN = regex(\n- # anything, followed by a quote, paren, or a tag end\n- r'''(.*?)'''\n- r'''((?P<quote>(['\"]))|(?P<open>(\\())|(?P<close>(\\))))'''\n-)\n-\n \n-class BlockIterator(object):\n+class TagIterator(object):\n def __init__(self, data):\n self.data = data\n self.blocks = []\n@@ -135,17 +104,6 @@ def _search(self, pattern):\n def _match(self, pattern):\n return pattern.match(self.data, self.pos)\n \n- def handle_raw(self, match):\n- start = match.end()\n- end_pat = BlockTag('raw', None).end_pat()\n- end_match = self._search(end_pat)\n- if end_match is None:\n- dbt.exceptions.raise_compiler_error(\n- 'unexpected EOF, expected {% endraw %}'\n- )\n- self.advance(end_match.end())\n- return BlockData(self.data[start:end_match.start()])\n-\n def _first_match(self, *patterns, **kwargs):\n matches = []\n for pattern in patterns:\n@@ -199,216 +157,87 @@ def handle_expr(self, match):\n \n self.advance(match.end())\n \n- def _advance_to_tag_close(self):\n- endtag = self._expect_match('%}', TAG_CLOSE_PATTERN)\n- self.advance(endtag.end())\n-\n- def _consume_to_tag(self, tag_name, start):\n- def block_handler(block_match):\n- block_type_name = block_match.groupdict()['block_type_name']\n- if block_type_name == tag_name:\n- self.advance(block_match.end())\n- self._advance_to_tag_close()\n- return self.data[start:block_match.start()]\n- else:\n- # must be a new block\n- self.handle_block(block_match)\n-\n- return self.next_block(block_handler)\n-\n- def _consume_block_contents(self, match):\n- \"\"\"Find a block's end. The current state of the parser should be after\n- the open block is completed:\n+ def handle_comment(self, match):\n+ self.advance(match.end())\n+ match = self._expect_match('#}', COMMENT_END_PATTERN)\n+ self.advance(match.end())\n \n- {% blk foo %}my data {% endblk %}\n- ^ right here\n+ def _expect_block_close(self):\n+ \"\"\"Search for the tag close marker.\n+ To the right of the type name, there are a few possiblities:\n+ - a name (handled by the regex's 'block_name')\n+ - any number of: `=`, `(`, `)`, strings, etc (arguments)\n+ - nothing\n \n- This will recurse!\n+ followed eventually by a %}\n \n- :param re.Match match: The regex match for the block tag to look for\n- the end of.\n- :return re.Match: An end pattern match for the block. Should be an\n- re.Match correspondding to\n- `BlockTag(**match.groupdict()).end_pat()`\n+ So the only characters we actually have to worry about in this context\n+ are quote and `%}` - nothing else can hide the %} and be valid jinja.\n \"\"\"\n- block = BlockTag(**match.groupdict())\n-\n- contents = self._consume_to_tag(block.end_block_type_name, self.pos)\n- if contents is None:\n- dbt.exceptions.raise_compiler_error(\n- 'Never found a close tag for the open tag {} (\"{}\")'\n- .format(block.block_type_name, block.end_block_type_name)\n+ while True:\n+ end_match = self._expect_match(\n+ 'tag close (\"%}\")',\n+ QUOTE_START_PATTERN,\n+ TAG_CLOSE_PATTERN\n )\n- block.contents = contents\n- return block\n-\n- def handle_top_block(self, match):\n- \"\"\"Handle a block. The current state of the parser should be after the\n- block open tag is completed:\n- {% blk foo %}my data {% endblk %}\n- ^ right here\n- \"\"\"\n- # we have to handle comments inside blocks because you could do this:\n- # {% blk foo %}asdf {# {% endblk %} #} {%endblk%}\n- # they still end up in the data/raw_data of the block itself, but we\n- # have to know to ignore stuff until the end comment marker!\n-\n- # the full block started at the given match start, which may include\n- # prefixed whitespace! we'll strip it later\n- block_start = match.start()\n- found = self.handle_block(match)\n- found.full_block = self.data[block_start:self.pos]\n- return found\n-\n- def handle_materialization_block(self, match):\n- \"\"\"Handle a materialization block. The current status of the parser\n- should be:\n- {% materialization custom, default %}\n- ^ right here\n-\n- And the match should be for \"{% materialization custom\"\n- \"\"\"\n- self.advance(match.end())\n- self._expect_match('materialization args',\n- MATERIALIZATION_ARGS_PATTERN)\n- self._advance_to_tag_close()\n- # Now we're just looking for {% endmaterialization %}\n- return self._consume_block_contents(match)\n-\n- def handle_do_block(self, match, expect_block):\n- if expect_block:\n- # we might be wrong to expect a block ({% do (...) %}, for example)\n- # so see if there's more data before the tag closes. if there\n- # isn't, we expect a block.\n- close_match = self._expect_match('%}', TAG_CLOSE_PATTERN)\n- unprocessed = self.data[match.end():close_match.start()].strip()\n- expect_block = not unprocessed\n-\n- if expect_block:\n- # if we're here, expect_block is True and we must have set\n- # close_match\n- self.advance(close_match.end())\n- block = self._consume_block_contents(match)\n- else:\n- # we have a do-statement like {% do thing() %}, so no {% enddo %}\n- # also, we don't want to advance to the end of the match, as it\n- # might be inside a string or something! So go back and figure out\n- # this should get us past \"{% do\"\n- self.advance(match.end())\n- self._process_rval_components()\n- block = BlockTag('do', None,\n- full_block=self.data[match.start():self.pos])\n- return block\n-\n- def handle_set_block(self, match):\n- self.advance(match.end())\n- equal_or_close = self._expect_match('%} or =',\n- TAG_CLOSE_PATTERN, regex(r'='))\n- self.advance(equal_or_close.end())\n- if equal_or_close.groupdict().get('tag_close') is None:\n- # it's an equals sign, must be like {% set x = 1 %}\n- self._process_rval_components()\n- # watch out, order matters here on python 2\n- block = BlockTag(full_block=self.data[match.start():self.pos],\n- **match.groupdict())\n- else:\n- # it's a tag close, must be like {% set x %}...{% endset %}\n- block = self._consume_block_contents(match)\n- return block\n-\n- def handle_if_block(self, match):\n+ self.advance(end_match.end())\n+ if end_match.groupdict().get('tag_close') is not None:\n+ return\n+ # must be a string. Rewind to its start and advance past it.\n+ self.rewind()\n+ string_match = self._expect_match('string', STRING_PATTERN)\n+ self.advance(string_match.end())\n+\n+ def handle_raw(self):\n+ # raw blocks are super special, they are a single complete regex\n+ match = self._expect_match('{% raw %}...{% endraw %}',\n+ RAW_BLOCK_PATTERN)\n self.advance(match.end())\n- self._process_rval_components()\n- return self._consume_block_contents(match)\n+ return match.end()\n \n- def handle_elif_block(self, match):\n- self.advance(match.end())\n- self._process_rval_components()\n+ def handle_tag(self, match):\n+ \"\"\"The tag could be one of a few things:\n \n- def handle_else_block(self, match):\n- self.advance(match.end())\n- self._advance_to_tag_close()\n+ {% mytag %}\n+ {% mytag x = y %}\n+ {% mytag x = \"y\" %}\n+ {% mytag x.y() %}\n+ {% mytag foo(\"a\", \"b\", c=\"d\") %}\n \n- def handle_comment(self, match):\n- self.advance(match.end())\n- match = self._expect_match('#}', COMMENT_END_PATTERN)\n- self.advance(match.end())\n-\n- def handle_normal_block(self, match):\n- # once we've advanced to the end of the given match, we're somewhere\n- # like this: {% block_type_name block_type\n- # we've either got arguments, a close of tag (%}), or bad input.\n- # we've handled materializations already (they're weird!)\n- # thankfully, comments aren't allowed *inside* a block def...\n- self.advance(match.end())\n- block_end_match = self._expect_match('%} or (...)',\n- TAG_CLOSE_PATTERN,\n- MACRO_ARGS_START_PATTERN)\n- self.advance(block_end_match.end())\n- if block_end_match.groupdict().get('macro_start') is not None:\n- # we've hit our first parenthesis!\n- self._parenthesis_stack = [True]\n- self._process_macro_args()\n- self._advance_to_tag_close()\n-\n- # tag close time!\n- return self._consume_block_contents(match)\n-\n- def handle_block(self, match):\n- matchgroups = match.groupdict()\n- if 'block_type_name' not in matchgroups:\n- raise dbt.exceptions.InternalException(\n- 'Got bad matchgroups {} in handle_block'.format(matchgroups)\n- )\n- block_type_name = matchgroups['block_type_name']\n+ But the key here is that it's always going to be `{% mytag`!\n+ \"\"\"\n+ groups = match.groupdict()\n+ # always a value\n+ block_type_name = groups['block_type_name']\n+ # might be None\n+ block_name = groups.get('block_name')\n+ start_pos = self.pos\n if block_type_name == 'raw':\n- block = self.handle_raw(match)\n- elif block_type_name == 'materialization':\n- block = self.handle_materialization_block(match)\n- elif block_type_name == 'do':\n- # if there is a \"block_name\" in the match groups, we don't expect a\n- # block as the \"block name\" is actually part of the do-statement.\n- # we need to do this to handle the (weird and probably wrong!) case\n- # of a do-statement that is only a single identifier - techincally\n- # allowed in jinja. (for example, {% do thing %})\n- expect_block = matchgroups.get('block_name') is None\n- block = self.handle_do_block(match, expect_block=expect_block)\n- elif block_type_name == 'set':\n- block = self.handle_set_block(match)\n- elif block_type_name == 'if':\n- block = self.handle_if_block(match)\n- elif block_type_name == 'elif':\n- block = self.handle_elif_block(match)\n- elif block_type_name == 'else':\n- block = self.handle_else_block(match)\n+ match = self._expect_match('{% raw %}...{% endraw %}',\n+ RAW_BLOCK_PATTERN)\n+ self.advance(match.end())\n else:\n- block = self.handle_normal_block(match)\n- return block\n-\n- def next_block(self, block_handler, include_toplevel=False):\n- \"\"\"Return the next block, advancing the position as appropriate.\n-\n- If include_toplevel is True, next_block will return a BlockData\n- containing any extra pre-match space\n-\n- \"\"\"\n+ self.advance(match.end())\n+ self._expect_block_close()\n+ return Tag(\n+ block_type_name=block_type_name,\n+ block_name=block_name,\n+ start=start_pos,\n+ end=self.pos\n+ )\n+\n+ def find_tags(self):\n while True:\n match = self._first_match(\n BLOCK_START_PATTERN,\n COMMENT_START_PATTERN,\n- EXPR_START_PATTERN)\n-\n+ EXPR_START_PATTERN\n+ )\n if match is None:\n- # raise StopIteration?\n- return None\n-\n- raw_toplevel = self.data[self.pos:match.start()]\n- if len(raw_toplevel) > 0:\n- self.advance(match.start())\n- if include_toplevel:\n- return BlockData(raw_toplevel)\n+ break\n \n- start = self.pos\n+ self.advance(match.start())\n+ # start = self.pos\n \n groups = match.groupdict()\n comment_start = groups.get('comment_start')\n@@ -417,156 +246,126 @@ def next_block(self, block_handler, include_toplevel=False):\n \n if comment_start is not None:\n self.handle_comment(match)\n- if include_toplevel:\n- return BlockData(self.data[start:self.pos])\n elif expr_start is not None:\n self.handle_expr(match)\n- if include_toplevel:\n- return BlockData(self.data[start:self.pos])\n elif block_type_name is not None:\n- block = block_handler(match)\n- if block is not None:\n- return block\n- elif include_toplevel:\n- return BlockData(self.data[start:self.pos])\n+ yield self.handle_tag(match)\n else:\n raise dbt.exceptions.InternalException(\n 'Invalid regex match in next_block, expected block start, '\n 'expr start, or comment start'\n )\n \n- def find_blocks(self):\n- def block_handler(match):\n- block_start = match.start()\n- block = self.handle_block(match)\n- block.full_block = self.data[block_start:self.pos]\n- return block\n+ def __iter__(self):\n+ return self.find_tags()\n \n- while self.data[self.pos:]:\n- block = self.next_block(block_handler, include_toplevel=True)\n- if block is None:\n- break\n- yield block\n \n- raw_toplevel = self.data[self.pos:]\n- if len(raw_toplevel) > 0:\n- yield BlockData(raw_toplevel)\n+duplicate_tags = (\n+ 'Got nested tags: {outer.block_type_name} (started at {outer.start}) did '\n+ 'not have a matching {{% end{outer.block_type_name} %}} before a '\n+ 'subsequent {inner.block_type_name} was found (started at {inner.start})'\n+)\n \n- def _process_rval_components(self):\n- \"\"\"This is suspiciously similar to _process_macro_default_arg, probably\n- want to figure out how to merge the two.\n \n- Process the rval of an assignment statement or a do-block\n- \"\"\"\n- while True:\n- match = self._expect_match(\n- 'do block component',\n- # you could have a string, though that would be weird\n- STRING_PATTERN,\n- # a quote or an open/close parenthesis\n- NON_STRING_DO_BLOCK_MEMBER_PATTERN,\n- # a tag close\n- TAG_CLOSE_PATTERN\n- )\n- matchgroups = match.groupdict()\n- self.advance(match.end())\n- if matchgroups.get('string') is not None:\n- continue\n- elif matchgroups.get('quote') is not None:\n- self.rewind()\n- # now look for a string\n- match = self._expect_match('any string', STRING_PATTERN)\n- self.advance(match.end())\n- elif matchgroups.get('open'):\n- self._parenthesis_stack.append(True)\n- elif matchgroups.get('close'):\n- self._parenthesis_stack.pop()\n- elif matchgroups.get('tag_close'):\n- if self._parenthesis_stack:\n- msg = ('Found \"%}\", expected \")\"')\n- dbt.exceptions.raise_compiler_error(msg)\n- return\n- # else whitespace\n+_CONTROL_FLOW_TAGS = {\n+ 'if': 'endif',\n+ 'for': 'endfor',\n+}\n \n- def _process_macro_default_arg(self):\n- \"\"\"Handle the bit after an '=' in a macro default argument. This is\n- probably the trickiest thing. The goal here is to accept all strings\n- jinja would accept and always handle block start/end correctly: It's\n- fine to have false positives, jinja can fail later.\n+_CONTROL_FLOW_END_TAGS = {\n+ v: k\n+ for k, v in _CONTROL_FLOW_TAGS.items()\n+}\n \n- Return True if there are more arguments expected.\n- \"\"\"\n- while self._parenthesis_stack:\n- match = self._expect_match(\n- 'macro argument',\n- # you could have a string\n- STRING_PATTERN,\n- # a quote, a comma, or a open/close parenthesis\n- NON_STRING_MACRO_ARGS_PATTERN,\n- # we want to \"match\", not \"search\"\n- method='match'\n- )\n- matchgroups = match.groupdict()\n- self.advance(match.end())\n- if matchgroups.get('string') is not None:\n- # we got a string value. There could be more data.\n- continue\n- elif matchgroups.get('quote') is not None:\n- # we got a bunch of data and then a string opening value.\n- # put the quote back on the menu\n- self.rewind()\n- # now look for a string\n- match = self._expect_match('any string', STRING_PATTERN)\n- self.advance(match.end())\n- elif matchgroups.get('comma') is not None:\n- # small hack: if we hit a comma and there is one parenthesis\n- # left, return to look for a new name. otherwise we're still\n- # looking for the parameter close.\n- if len(self._parenthesis_stack) == 1:\n- return\n- elif matchgroups.get('open'):\n- self._parenthesis_stack.append(True)\n- elif matchgroups.get('close'):\n- self._parenthesis_stack.pop()\n- else:\n- raise dbt.exceptions.InternalException(\n- 'unhandled regex in _process_macro_default_arg(), no match'\n- ': {}'.format(matchgroups)\n- )\n \n- def _process_macro_args(self):\n- \"\"\"Macro args are pretty tricky! Arg names themselves are simple, but\n- you can set arbitrary default values, including doing stuff like:\n- {% macro my_macro(arg=\"x\" + (\"}% {# {% endmacro %}\" * 2)) %}\n+class BlockIterator(object):\n+ def __init__(self, data):\n+ self.tag_parser = TagIterator(data)\n+ self.current = None\n+ self.stack = []\n+ self.last_position = 0\n+\n+ @property\n+ def current_end(self):\n+ if self.current is None:\n+ return 0\n+ else:\n+ return self.current.end\n \n- Which makes you a jerk, but is valid jinja.\n- \"\"\"\n- # we are currently after the first parenthesis (+ any whitespace) after\n- # the macro args started. You can either have the close paren, or a\n- # name.\n- while self._parenthesis_stack:\n- match = self._expect_match('macro arguments',\n- MACRO_ARGS_END_PATTERN,\n- MACRO_ARG_PATTERN)\n- self.advance(match.end())\n- matchgroups = match.groupdict()\n- if matchgroups.get('macro_end') is not None:\n- self._parenthesis_stack.pop()\n- # we got an argument. let's see what it has\n- elif matchgroups.get('value') is not None:\n- # we have to process a single macro argument. This mutates\n- # the parenthesis stack! If it finds a comma, it will continue\n- # the loop.\n- self._process_macro_default_arg()\n- elif matchgroups.get('more_args') is not None:\n- continue\n- else:\n- raise dbt.exceptions.InternalException(\n- 'unhandled regex in _process_macro_args(), no match: {}'\n- .format(matchgroups)\n+ @property\n+ def data(self):\n+ return self.tag_parser.data\n+\n+ def is_current_end(self, tag):\n+ return (\n+ tag.block_type_name.startswith('end') and\n+ self.current is not None and\n+ tag.block_type_name[3:] == self.current.block_type_name\n+ )\n+\n+ def find_blocks(self, allowed_blocks=None, collect_raw_data=True):\n+ \"\"\"Find all top-level blocks in the data.\"\"\"\n+ if allowed_blocks is None:\n+ allowed_blocks = {'snapshot', 'macro', 'materialization', 'docs'}\n+\n+ for tag in self.tag_parser.find_tags():\n+ if tag.block_type_name in _CONTROL_FLOW_TAGS:\n+ self.stack.append(tag.block_type_name)\n+ elif tag.block_type_name in _CONTROL_FLOW_END_TAGS:\n+ found = None\n+ if self.stack:\n+ found = self.stack.pop()\n+ else:\n+ expected = _CONTROL_FLOW_END_TAGS[tag.block_type_name]\n+ dbt.exceptions.raise_compiler_error((\n+ 'Got an unexpected control flow end tag, got {} but '\n+ 'never saw a preceeding {} (@ {})'\n+ ).format(tag.block_type_name, expected, tag.start))\n+ expected = _CONTROL_FLOW_TAGS[found]\n+ if expected != tag.block_type_name:\n+ dbt.exceptions.raise_compiler_error((\n+ 'Got an unexpected control flow end tag, got {} but '\n+ 'expected {} next (@ {})'\n+ ).format(tag.block_type_name, expected, tag.start))\n+\n+ if tag.block_type_name in allowed_blocks:\n+ if self.stack:\n+ dbt.exceptions.raise_compiler_error((\n+ 'Got a block definition inside control flow at {}. '\n+ 'All dbt block definitions must be at the top level'\n+ ).format(tag.start))\n+ if self.current is not None:\n+ dbt.exceptions.raise_compiler_error(\n+ duplicate_tags.format(outer=self.current, inner=tag)\n+ )\n+ if collect_raw_data:\n+ raw_data = self.data[self.last_position:tag.start]\n+ self.last_position = tag.start\n+ if raw_data:\n+ yield BlockData(raw_data)\n+ self.current = tag\n+\n+ elif self.is_current_end(tag):\n+ self.last_position = tag.end\n+ yield BlockTag(\n+ block_type_name=self.current.block_type_name,\n+ block_name=self.current.block_name,\n+ contents=self.data[self.current.end:tag.start],\n+ full_block=self.data[self.current.start:tag.end]\n )\n- # if there are more arguments or a macro arg end we'll catch them\n- # on the next loop around\n-\n- def lex_for_blocks(self):\n- return list(self.find_blocks())\n+ self.current = None\n+\n+ if self.current:\n+ dbt.exceptions.raise_compiler_error((\n+ 'Reached EOF without finding a close block for '\n+ '{0.block_type_name} (from {0.end})'\n+ ).format(self.current))\n+\n+ if collect_raw_data:\n+ raw_data = self.data[self.last_position:]\n+ if raw_data:\n+ yield BlockData(raw_data)\n+\n+ def lex_for_blocks(self, allowed_blocks=None, collect_raw_data=True):\n+ return list(self.find_blocks(allowed_blocks=allowed_blocks,\n+ collect_raw_data=collect_raw_data))\ndiff --git a/core/dbt/clients/jinja.py b/core/dbt/clients/jinja.py\nindex 4ed0a083e4b..435b8d7e6a7 100644\n--- a/core/dbt/clients/jinja.py\n+++ b/core/dbt/clients/jinja.py\n@@ -354,5 +354,23 @@ def undefined_error(msg):\n raise jinja2.exceptions.UndefinedError(msg)\n \n \n-def extract_toplevel_blocks(data):\n- return BlockIterator(data).lex_for_blocks()\n+def extract_toplevel_blocks(data, allowed_blocks=None, collect_raw_data=True):\n+ \"\"\"Extract the top level blocks with matching block types from a jinja\n+ file, with some special handling for block nesting.\n+\n+ :param str data: The data to extract blocks from.\n+ :param Optional[Set[str]] allowed_blocks: The names of the blocks to\n+ extract from the file. They may not be nested within if/for blocks.\n+ If None, use the default values.\n+ :param bool collect_raw_data: If set, raw data between matched blocks will\n+ also be part of the results, as `BlockData` objects. They have a\n+ `block_type_name` field of `'__dbt_data'` and will never have a\n+ `block_name`.\n+ :return List[Union[BlockData, BlockTag]]: A list of `BlockTag`s matching\n+ the allowed block types and (if `collect_raw_data` is `True`)\n+ `BlockData` objects.\n+ \"\"\"\n+ return BlockIterator(data).lex_for_blocks(\n+ allowed_blocks=allowed_blocks,\n+ collect_raw_data=collect_raw_data\n+ )\ndiff --git a/core/dbt/parser/docs.py b/core/dbt/parser/docs.py\nindex 5d22aa526d7..463b52a3fdd 100644\n--- a/core/dbt/parser/docs.py\n+++ b/core/dbt/parser/docs.py\n@@ -44,16 +44,17 @@ def load_file(cls, package_name, root_dir, relative_dirs):\n \n def parse(self, docfile):\n try:\n- blocks = extract_toplevel_blocks(docfile.file_contents)\n+ blocks = extract_toplevel_blocks(\n+ docfile.file_contents,\n+ allowed_blocks={'docs'},\n+ collect_raw_data=False\n+ )\n except dbt.exceptions.CompilationException as exc:\n if exc.node is None:\n exc.node = docfile\n raise\n \n for block in blocks:\n- if block.block_type_name != NodeType.Documentation:\n- continue\n-\n try:\n template = get_template(block.full_block, {})\n except dbt.exceptions.CompilationException as e:\ndiff --git a/core/dbt/parser/snapshots.py b/core/dbt/parser/snapshots.py\nindex 84e3d6b8c90..8733e585efb 100644\n--- a/core/dbt/parser/snapshots.py\n+++ b/core/dbt/parser/snapshots.py\n@@ -26,16 +26,15 @@ def parse_snapshots_from_file(self, file_node, tags=None):\n # (we hope!) `snapshot` blocks\n try:\n blocks = dbt.clients.jinja.extract_toplevel_blocks(\n- file_node['raw_sql']\n+ file_node['raw_sql'],\n+ allowed_blocks={'snapshot'},\n+ collect_raw_data=False\n )\n except dbt.exceptions.CompilationException as exc:\n if exc.node is None:\n exc.node = file_node\n raise\n for block in blocks:\n- if block.block_type_name != NodeType.Snapshot:\n- # non-snapshot blocks are just ignored\n- continue\n name = block.block_name\n raw_sql = block.contents\n updates = {\ndiff --git a/core/dbt/rpc.py b/core/dbt/rpc.py\nindex 87305d89ee7..f6999e328ed 100644\n--- a/core/dbt/rpc.py\n+++ b/core/dbt/rpc.py\n@@ -267,12 +267,28 @@ def handle(self, kwargs):\n self.started = time.time()\n self.timeout = kwargs.pop('timeout', None)\n self.queue = multiprocessing.Queue()\n- self.process = multiprocessing.Process(\n- target=_task_bootstrap,\n- args=(self.task, self.queue, kwargs)\n- )\n- self.process.start()\n- result = self.get_result()\n+ if self.task.args.single_threaded:\n+ _task_bootstrap(self.task, self.queue, kwargs)\n+ try:\n+ msgtype, result = self._wait_for_results()\n+ except dbt.exceptions.RPCTimeoutException:\n+ raise timeout_error(self.timeout)\n+ except dbt.exceptions.Exception as exc:\n+ raise dbt_error(exc)\n+ except Exception as exc:\n+ raise server_error(exc)\n+\n+ if msgtype == QueueMessageType.Error:\n+ raise RPCException.from_error(result)\n+\n+ return result\n+ else:\n+ self.process = multiprocessing.Process(\n+ target=_task_bootstrap,\n+ args=(self.task, self.queue, kwargs)\n+ )\n+ self.process.start()\n+ result = self.get_result()\n return result\n \n @property\ndiff --git a/core/dbt/task/rpc_server.py b/core/dbt/task/rpc_server.py\nindex 0dfdfa4c277..370e10b80d4 100644\n--- a/core/dbt/task/rpc_server.py\n+++ b/core/dbt/task/rpc_server.py\n@@ -60,7 +60,7 @@ def run(self):\n # easier as well). The alternative involves tracking metadata+state in\n # a multiprocessing.Manager, adds polling the manager to the request\n # task handler and in general gets messy fast.\n- run_simple(host, port, app, threaded=True)\n+ run_simple(host, port, app, threaded=not self.args.single_threaded)\n \n @Request.application\n def handle_jsonrpc_request(self, request):\ndiff --git a/test/unit/test_jinja.py b/test/unit/test_jinja.py\nindex 79d5b885937..10ff0ab9ae9 100644\n--- a/test/unit/test_jinja.py\n+++ b/test/unit/test_jinja.py\n@@ -18,7 +18,7 @@ class TestBlockLexer(unittest.TestCase):\n def test_basic(self):\n body = '{{ config(foo=\"bar\") }}\\r\\nselect * from this.that\\r\\n'\n block_data = ' \\n\\r\\t{%- mytype foo %}'+body+'{%endmytype -%}'\n- blocks = extract_toplevel_blocks(block_data)\n+ blocks = extract_toplevel_blocks(block_data, allowed_blocks={'mytype'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'mytype')\n self.assertEqual(blocks[0].block_name, 'foo')\n@@ -36,16 +36,14 @@ def test_multiple(self):\n ' {% mytype foo %}' + body_one + '{% endmytype %}' +\n '\\r\\n{% othertype bar %}' + body_two + '{% endothertype %}'\n )\n- all_blocks = extract_toplevel_blocks(block_data)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(block_data, allowed_blocks={'mytype', 'othertype'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 2)\n \n def test_comments(self):\n body = '{{ config(foo=\"bar\") }}\\r\\nselect * from this.that\\r\\n'\n comment = '{# my comment #}'\n block_data = ' \\n\\r\\t{%- mytype foo %}'+body+'{%endmytype -%}'\n- all_blocks = extract_toplevel_blocks(comment+block_data)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(comment+block_data, allowed_blocks={'mytype'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'mytype')\n self.assertEqual(blocks[0].block_name, 'foo')\n@@ -56,8 +54,7 @@ def test_evil_comments(self):\n body = '{{ config(foo=\"bar\") }}\\r\\nselect * from this.that\\r\\n'\n comment = '{# external comment {% othertype bar %} select * from thing.other_thing{% endothertype %} #}'\n block_data = ' \\n\\r\\t{%- mytype foo %}'+body+'{%endmytype -%}'\n- all_blocks = extract_toplevel_blocks(comment+block_data)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(comment+block_data, allowed_blocks={'mytype'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'mytype')\n self.assertEqual(blocks[0].block_name, 'foo')\n@@ -68,8 +65,7 @@ def test_nested_comments(self):\n body = '{# my comment #} {{ config(foo=\"bar\") }}\\r\\nselect * from {# my other comment embedding {% endmytype %} #} this.that\\r\\n'\n block_data = ' \\n\\r\\t{%- mytype foo %}'+body+'{% endmytype -%}'\n comment = '{# external comment {% othertype bar %} select * from thing.other_thing{% endothertype %} #}'\n- all_blocks = extract_toplevel_blocks(comment+block_data)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(comment+block_data, allowed_blocks={'mytype'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'mytype')\n self.assertEqual(blocks[0].block_name, 'foo')\n@@ -77,8 +73,7 @@ def test_nested_comments(self):\n self.assertEqual(blocks[0].full_block, block_data)\n \n def test_complex_file(self):\n- all_blocks = extract_toplevel_blocks(complex_snapshot_file)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(complex_snapshot_file, allowed_blocks={'mytype', 'myothertype'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 3)\n self.assertEqual(blocks[0].block_type_name, 'mytype')\n self.assertEqual(blocks[0].block_name, 'foo')\n@@ -94,21 +89,35 @@ def test_complex_file(self):\n self.assertEqual(blocks[2].contents, x_block[len('\\n{% myothertype x %}'):-len('{% endmyothertype %}\\n')])\n \n def test_peaceful_macro_coexistence(self):\n- body = '{# my macro #} {% macro foo(a, b) %} do a thing {%- endmacro %} {# my model #} {% a b %} {% enda %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 2)\n- self.assertEqual(blocks[0].block_type_name, 'macro')\n- self.assertEqual(blocks[0].block_name, 'foo')\n- self.assertEqual(blocks[0].contents, ' do a thing')\n- self.assertEqual(blocks[1].block_type_name, 'a')\n- self.assertEqual(blocks[1].block_name, 'b')\n- self.assertEqual(blocks[1].contents, ' ')\n+ body = '{# my macro #} {% macro foo(a, b) %} do a thing {%- endmacro %} {# my model #} {% a b %} test {% enda %}'\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'macro', 'a'}, collect_raw_data=True)\n+ self.assertEqual(len(blocks), 4)\n+ self.assertEqual(blocks[0].full_block, '{# my macro #} ')\n+ self.assertEqual(blocks[1].block_type_name, 'macro')\n+ self.assertEqual(blocks[1].block_name, 'foo')\n+ self.assertEqual(blocks[1].contents, ' do a thing')\n+ self.assertEqual(blocks[2].full_block, ' {# my model #} ')\n+ self.assertEqual(blocks[3].block_type_name, 'a')\n+ self.assertEqual(blocks[3].block_name, 'b')\n+ self.assertEqual(blocks[3].contents, ' test ')\n+\n+ def test_macro_with_trailing_data(self):\n+ body = '{# my macro #} {% macro foo(a, b) %} do a thing {%- endmacro %} {# my model #} {% a b %} test {% enda %} raw data so cool'\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'macro', 'a'}, collect_raw_data=True)\n+ self.assertEqual(len(blocks), 5)\n+ self.assertEqual(blocks[0].full_block, '{# my macro #} ')\n+ self.assertEqual(blocks[1].block_type_name, 'macro')\n+ self.assertEqual(blocks[1].block_name, 'foo')\n+ self.assertEqual(blocks[1].contents, ' do a thing')\n+ self.assertEqual(blocks[2].full_block, ' {# my model #} ')\n+ self.assertEqual(blocks[3].block_type_name, 'a')\n+ self.assertEqual(blocks[3].block_name, 'b')\n+ self.assertEqual(blocks[3].contents, ' test ')\n+ self.assertEqual(blocks[4].full_block, ' raw data so cool')\n \n def test_macro_with_crazy_args(self):\n body = '''{% macro foo(a, b=asdf(\"cool this is 'embedded'\" * 3) + external_var, c)%}cool{# block comment with {% endmacro %} in it #} stuff here {% endmacro %}'''\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'macro'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'macro')\n self.assertEqual(blocks[0].block_name, 'foo')\n@@ -116,43 +125,36 @@ def test_macro_with_crazy_args(self):\n \n def test_materialization_parse(self):\n body = '{% materialization xxx, default %} ... {% endmaterialization %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'materialization'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'materialization')\n self.assertEqual(blocks[0].block_name, 'xxx')\n self.assertEqual(blocks[0].full_block, body)\n \n body = '{% materialization xxx, adapter=\"other\" %} ... {% endmaterialization %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'materialization'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'materialization')\n self.assertEqual(blocks[0].block_name, 'xxx')\n self.assertEqual(blocks[0].full_block, body)\n \n- def test_nested_ok(self):\n+ def test_nested_not_ok(self):\n # we don't allow nesting same blocks\n- # ideally we would not allow nesting any, but that's much harder\n body = '{% myblock a %} {% myblock b %} {% endmyblock %} {% endmyblock %}'\n- blocks = extract_toplevel_blocks(body)\n- self.assertEqual(len(blocks), 1)\n- self.assertEqual(blocks[0].block_type_name, 'myblock')\n- self.assertEqual(blocks[0].block_name, 'a')\n- self.assertEqual(blocks[0].contents, ' {% myblock b %} {% endmyblock %} ')\n- self.assertEqual(blocks[0].full_block, body)\n+ with self.assertRaises(CompilationException):\n+ extract_toplevel_blocks(body, allowed_blocks={'myblock'})\n \n def test_incomplete_block_failure(self):\n- fullbody = '{% myblock foo %} {% endblock %}'\n- for length in range(1, len(fullbody)-1):\n+ fullbody = '{% myblock foo %} {% endmyblock %}'\n+ for length in range(len('{% myblock foo %}'), len(fullbody)-1):\n body = fullbody[:length]\n- with self.assertRaises(CompilationException):\n- extract_toplevel_blocks(body)\n+ with self.assertRaises(CompilationException):\n+ extract_toplevel_blocks(body, allowed_blocks={'myblock'})\n \n def test_wrong_end_failure(self):\n body = '{% myblock foo %} {% endotherblock %}'\n with self.assertRaises(CompilationException):\n- extract_toplevel_blocks(body)\n+ extract_toplevel_blocks(body, allowed_blocks={'myblock', 'otherblock'})\n \n def test_comment_no_end_failure(self):\n body = '{# '\n@@ -161,124 +163,102 @@ def test_comment_no_end_failure(self):\n \n def test_comment_only(self):\n body = '{# myblock #}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body)\n+ self.assertEqual(len(blocks), 1)\n+ blocks = extract_toplevel_blocks(body, collect_raw_data=False)\n self.assertEqual(len(blocks), 0)\n \n def test_comment_block_self_closing(self):\n # test the case where a comment start looks a lot like it closes itself\n # (but it doesn't in jinja!)\n body = '{#} {% myblock foo %} {#}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, collect_raw_data=False)\n self.assertEqual(len(blocks), 0)\n \n def test_embedded_self_closing_comment_block(self):\n body = '{% myblock foo %} {#}{% endmyblock %} {#}{% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].full_block, body)\n self.assertEqual(blocks[0].contents, ' {#}{% endmyblock %} {#}')\n \n def test_set_statement(self):\n body = '{% set x = 1 %}{% myblock foo %}hi{% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 2)\n- self.assertEqual(blocks[0].full_block, '{% set x = 1 %}')\n- self.assertEqual(blocks[1].full_block, '{% myblock foo %}hi{% endmyblock %}')\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock'}, collect_raw_data=False)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, '{% myblock foo %}hi{% endmyblock %}')\n \n def test_set_block(self):\n body = '{% set x %}1{% endset %}{% myblock foo %}hi{% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 2)\n- self.assertEqual(blocks[0].contents, '1')\n- self.assertEqual(blocks[0].block_type_name, 'set')\n- self.assertEqual(blocks[0].block_name, 'x')\n- self.assertEqual(blocks[1].full_block, '{% myblock foo %}hi{% endmyblock %}')\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock'}, collect_raw_data=False)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, '{% myblock foo %}hi{% endmyblock %}')\n \n def test_crazy_set_statement(self):\n body = '{% set x = (thing(\"{% myblock foo %}\")) %}{% otherblock bar %}x{% endotherblock %}{% set y = otherthing(\"{% myblock foo %}\") %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 3)\n- self.assertEqual(blocks[0].full_block, '{% set x = (thing(\"{% myblock foo %}\")) %}')\n- self.assertEqual(blocks[0].block_type_name, 'set')\n- self.assertEqual(blocks[1].full_block, '{% otherblock bar %}x{% endotherblock %}')\n- self.assertEqual(blocks[1].block_type_name, 'otherblock')\n- self.assertEqual(blocks[2].full_block, '{% set y = otherthing(\"{% myblock foo %}\") %}')\n- self.assertEqual(blocks[2].block_type_name, 'set')\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'otherblock'}, collect_raw_data=False)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, '{% otherblock bar %}x{% endotherblock %}')\n+ self.assertEqual(blocks[0].block_type_name, 'otherblock')\n \n def test_do_statement(self):\n body = '{% do thing.update() %}{% myblock foo %}hi{% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 2)\n- self.assertEqual(blocks[0].full_block, '{% do thing.update() %}')\n- self.assertEqual(blocks[1].full_block, '{% myblock foo %}hi{% endmyblock %}')\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock'}, collect_raw_data=False)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, '{% myblock foo %}hi{% endmyblock %}')\n \n def test_deceptive_do_statement(self):\n body = '{% do thing %}{% myblock foo %}hi{% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 2)\n- self.assertEqual(blocks[0].full_block, '{% do thing %}')\n- self.assertEqual(blocks[1].full_block, '{% myblock foo %}hi{% endmyblock %}')\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock'}, collect_raw_data=False)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, '{% myblock foo %}hi{% endmyblock %}')\n \n def test_do_block(self):\n body = '{% do %}thing.update(){% enddo %}{% myblock foo %}hi{% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'do', 'myblock'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 2)\n self.assertEqual(blocks[0].contents, 'thing.update()')\n self.assertEqual(blocks[0].block_type_name, 'do')\n self.assertEqual(blocks[1].full_block, '{% myblock foo %}hi{% endmyblock %}')\n \n def test_crazy_do_statement(self):\n- body = '{% do (thing(\"{% myblock foo %}\")) %}{% otherblock bar %}x{% endotherblock %}{% do otherthing(\"{% myblock foo %}\") %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 3)\n- self.assertEqual(blocks[0].full_block, '{% do (thing(\"{% myblock foo %}\")) %}')\n- self.assertEqual(blocks[0].block_type_name, 'do')\n- self.assertEqual(blocks[1].full_block, '{% otherblock bar %}x{% endotherblock %}')\n- self.assertEqual(blocks[1].block_type_name, 'otherblock')\n- self.assertEqual(blocks[2].full_block, '{% do otherthing(\"{% myblock foo %}\") %}')\n- self.assertEqual(blocks[2].block_type_name, 'do')\n+ body = '{% do (thing(\"{% myblock foo %}\")) %}{% otherblock bar %}x{% endotherblock %}{% do otherthing(\"{% myblock foo %}\") %}{% myblock x %}hi{% endmyblock %}'\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock', 'otherblock'}, collect_raw_data=False)\n+ self.assertEqual(len(blocks), 2)\n+ self.assertEqual(blocks[0].full_block, '{% otherblock bar %}x{% endotherblock %}')\n+ self.assertEqual(blocks[0].block_type_name, 'otherblock')\n+ self.assertEqual(blocks[1].full_block, '{% myblock x %}hi{% endmyblock %}')\n+ self.assertEqual(blocks[1].block_type_name, 'myblock')\n \n def test_awful_jinja(self):\n- all_blocks = extract_toplevel_blocks(if_you_do_this_you_are_awful)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n- self.assertEqual(len(blocks), 4)\n- self.assertEqual(blocks[0].block_type_name, 'do')\n- self.assertEqual(blocks[0].full_block, '''{% do\\n set('foo=\"bar\"')\\n%}''')\n- self.assertEqual(blocks[1].block_type_name, 'set')\n- self.assertEqual(blocks[1].full_block, '''{% set x = (\"100\" + \"hello'\" + '%}') %}''')\n- self.assertEqual(blocks[2].block_type_name, 'snapshot')\n- self.assertEqual(blocks[2].contents, '\\n '.join([\n+ blocks = extract_toplevel_blocks(\n+ if_you_do_this_you_are_awful,\n+ allowed_blocks={'snapshot', 'materialization'},\n+ collect_raw_data=False\n+ )\n+ self.assertEqual(len(blocks), 2)\n+ self.assertEqual(len([b for b in blocks if b.block_type_name == '__dbt__data']), 0)\n+ self.assertEqual(blocks[0].block_type_name, 'snapshot')\n+ self.assertEqual(blocks[0].contents, '\\n '.join([\n '''{% set x = (\"{% endsnapshot %}\" + (40 * '%})')) %}''',\n '{# {% endsnapshot %} #}',\n '{% embedded %}',\n ' some block data right here',\n '{% endembedded %}'\n ]))\n- self.assertEqual(blocks[3].block_type_name, 'materialization')\n- self.assertEqual(blocks[3].contents, '\\nhi\\n')\n+ self.assertEqual(blocks[1].block_type_name, 'materialization')\n+ self.assertEqual(blocks[1].contents, '\\nhi\\n')\n \n def test_quoted_endblock_within_block(self):\n body = '{% myblock something -%} {% set x = (\"{% endmyblock %}\") %} {% endmyblock %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'myblock'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'myblock')\n self.assertEqual(blocks[0].contents, '{% set x = (\"{% endmyblock %}\") %} ')\n \n def test_docs_block(self):\n body = '{% docs __my_doc__ %} asdf {# nope {% enddocs %}} #} {% enddocs %} {% docs __my_other_doc__ %} asdf \"{% enddocs %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'docs'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 2)\n self.assertEqual(blocks[0].block_type_name, 'docs')\n self.assertEqual(blocks[0].contents, ' asdf {# nope {% enddocs %}} #} ')\n@@ -289,8 +269,7 @@ def test_docs_block(self):\n \n def test_docs_block_expr(self):\n body = '{% docs more_doc %} asdf {{ \"{% enddocs %}\" ~ \"}}\" }}{% enddocs %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'docs'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'docs')\n self.assertEqual(blocks[0].contents, ' asdf {{ \"{% enddocs %}\" ~ \"}}\" }}')\n@@ -299,13 +278,49 @@ def test_docs_block_expr(self):\n def test_unclosed_model_quotes(self):\n # test case for https://github.com/fishtown-analytics/dbt/issues/1533\n body = '{% model my_model -%} select * from \"something\".\"something_else{% endmodel %}'\n- all_blocks = extract_toplevel_blocks(body)\n- blocks = [b for b in all_blocks if b.block_type_name != '__dbt__data']\n+ blocks = extract_toplevel_blocks(body, allowed_blocks={'model'}, collect_raw_data=False)\n self.assertEqual(len(blocks), 1)\n self.assertEqual(blocks[0].block_type_name, 'model')\n self.assertEqual(blocks[0].contents, 'select * from \"something\".\"something_else')\n self.assertEqual(blocks[0].block_name, 'my_model')\n \n+ def test_if(self):\n+ # if you conditionally define your macros/models, don't\n+ body = '{% if true %}{% macro my_macro() %} adsf {% endmacro %}{% endif %}'\n+ with self.assertRaises(CompilationException):\n+ extract_toplevel_blocks(body)\n+\n+ def test_if_innocuous(self):\n+ body = '{% if true %}{% something %}asdfasd{% endsomething %}{% endif %}'\n+ blocks = extract_toplevel_blocks(body)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, body)\n+\n+ def test_for(self):\n+ # no for-loops over macros.\n+ body = '{% for x in range(10) %}{% macro my_macro() %} adsf {% endmacro %}{% endfor %}'\n+ with self.assertRaises(CompilationException):\n+ extract_toplevel_blocks(body)\n+\n+ def test_for_innocuous(self):\n+ # no for-loops over macros.\n+ body = '{% for x in range(10) %}{% something my_something %} adsf {% endsomething %}{% endfor %}'\n+ blocks = extract_toplevel_blocks(body)\n+ self.assertEqual(len(blocks), 1)\n+ self.assertEqual(blocks[0].full_block, body)\n+\n+ def test_endif(self):\n+ body = '{% snapshot foo %}select * from thing{% endsnapshot%}{% endif %}'\n+ with self.assertRaises(CompilationException) as err:\n+ extract_toplevel_blocks(body)\n+ self.assertIn('Got an unexpected control flow end tag, got endif but never saw a preceeding if (@ 53)', str(err.exception))\n+\n+ def test_if_endfor(self):\n+ body = '{% if x %}...{% endfor %}{% endif %}'\n+ with self.assertRaises(CompilationException) as err:\n+ extract_toplevel_blocks(body)\n+ self.assertIn('Got an unexpected control flow end tag, got endfor but expected endif next (@ 13)', str(err.exception))\n+\n \n bar_block = '''{% mytype bar %}\n {# a comment\n@@ -359,4 +374,3 @@ def test_unclosed_model_quotes(self):\n hi\n {% endmaterialization %}\n '''\n-\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 4,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2374,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-1453@70206b1"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":1453,"string":"1,453"},"title":{"kind":"string","value":"Warn on unpinned git packages (#1446)"},"body":{"kind":"string","value":"Fixes #1446\r\n\r\nThis fails the run in strict mode and logs a warning otherwise.\r\n\r\nWith no repository set and no value for `warn-unpinned`:\r\n```\r\n$ cat packages.yml\r\npackages:\r\n - git: \"https://github.com/fishtown-analytics/dbt-utils\"\r\n$ dbt deps\r\nRunning with dbt=0.13.0\r\nWARNING: Version for https://github.com/fishtown-analytics/dbt-utils not pinned - \"master\" may introduce breaking changes without warning! See https://docs.getdbt.com/docs/package-management#section-specifying-package-versions\r\nInstalling https://github.com/fishtown-analytics/dbt-utils@master\r\n Installed from revision master\r\n$ dbt --strict deps\r\nRunning with dbt=0.13.0\r\nEncountered an error:\r\nCompilation Error\r\n Version for https://github.com/fishtown-analytics/dbt-utils not pinned - \"master\" may introduce breaking changes without warning! See https://docs.getdbt.com/docs/package-management#section-specifying-package-versions\r\n```\r\n\r\n\r\nWith a version set:\r\n\r\n```\r\n$ cat packages.yml\r\npackages:\r\n - git: \"https://github.com/fishtown-analytics/dbt-utils\"\r\n revision: 0.1.0\r\n$ dbt --strict deps\r\nRunning with dbt=0.13.0\r\nInstalling https://github.com/fishtown-analytics/dbt-utils@0.1.0\r\n Installed from revision 0.1.0\r\n```\r\n\r\n\r\nWith warn-unpinned set to False:\r\n```\r\n$ cat packages.yml\r\npackages:\r\n - git: \"https://github.com/fishtown-analytics/dbt-utils\"\r\n warn-unpinned: false\r\n$ dbt deps\r\nRunning with dbt=0.13.0\r\nInstalling https://github.com/fishtown-analytics/dbt-utils@master\r\n Installed from revision master\r\n$ dbt --strict deps\r\nRunning with dbt=0.13.0\r\nInstalling https://github.com/fishtown-analytics/dbt-utils@master\r\n Installed from revision master\r\n```\r\n"},"created_at":{"kind":"string","value":"2019-05-10T02:34:44Z"},"problem_statement":{"kind":"string","value":"Warn for packages that are not pinned to a specific version\n## Feature\r\n\r\n### Feature description\r\nWhen we make breaking changes to repos like `dbt-utils`, we invariably break _someone's_ project. This happens when people 1) don't specify a version/revision for their package or 2) specify something overly broad, like `master`.\r\n\r\nWhile this is pretty well documented (we could do a better job of documenting this in the actual packages), dbt should also WARN if a package is specified without a version/revision, or with the revision `master`. We should additionally add a config (project-level? profile-level? in the `packages.yml` file?) which opts out of this warning.\r\n\r\n### Who will this benefit?\r\nFolks that are using packages and don't want external code changes to brick their projects."},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"## Feature\r\n\r\n### Feature description\r\nWhen we make breaking changes to repos like `dbt-utils`, we invariably break _someone's_ project. This happens when people 1) don't specify a version/revision for their package or 2) specify something overly broad, like `master`.\r\n\r\nWhile this is pretty well documented (we could do a better job of documenting this in the actual packages), dbt should also WARN if a package is specified without a version/revision, or with the revision `master`. We should additionally add a config (project-level? profile-level? in the `packages.yml` file?) which opts out of this warning.\r\n\r\n### Who will this benefit?\r\nFolks that are using packages and don't want external code changes to brick their projects.","number":1446,"title":"Warn for packages that are not pinned to a specific version"}],"string":"[\n {\n \"body\": \"## Feature\\r\\n\\r\\n### Feature description\\r\\nWhen we make breaking changes to repos like `dbt-utils`, we invariably break _someone's_ project. This happens when people 1) don't specify a version/revision for their package or 2) specify something overly broad, like `master`.\\r\\n\\r\\nWhile this is pretty well documented (we could do a better job of documenting this in the actual packages), dbt should also WARN if a package is specified without a version/revision, or with the revision `master`. We should additionally add a config (project-level? profile-level? in the `packages.yml` file?) which opts out of this warning.\\r\\n\\r\\n### Who will this benefit?\\r\\nFolks that are using packages and don't want external code changes to brick their projects.\",\n \"number\": 1446,\n \"title\": \"Warn for packages that are not pinned to a specific version\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"cc8ef4774798059b4a0ee4364b6944a487b2fa6b"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"70206b16355fa786b880ceef88d31cbb6d14e5fc\",\n \"head_commit_message\": \"warn on unpinned dependencies, unless warn-unpinned: False is set in packages.yml\",\n \"patch_to_review\": \"diff --git a/core/dbt/contracts/project.py b/core/dbt/contracts/project.py\\nindex 9e79101f52a..3bda33e2500 100644\\n--- a/core/dbt/contracts/project.py\\n+++ b/core/dbt/contracts/project.py\\n@@ -188,6 +188,9 @@ class Project(APIObject):\\n 'items': {'type': 'string'},\\n 'description': 'The git revision to use, if it is not tip',\\n },\\n+ 'warn-unpinned': {\\n+ 'type': 'boolean',\\n+ }\\n },\\n 'required': ['git'],\\n }\\ndiff --git a/core/dbt/task/deps.py b/core/dbt/task/deps.py\\nindex aaf37979ef6..50bc0cff25c 100644\\n--- a/core/dbt/task/deps.py\\n+++ b/core/dbt/task/deps.py\\n@@ -25,6 +25,7 @@\\n \\n DOWNLOADS_PATH = None\\n REMOVE_DOWNLOADS = False\\n+PIN_PACKAGE_URL = 'https://docs.getdbt.com/docs/package-management#section-specifying-package-versions' # noqa\\n \\n \\n def _initialize_downloads():\\n@@ -215,6 +216,8 @@ class GitPackage(Package):\\n SCHEMA = GIT_PACKAGE_CONTRACT\\n \\n def __init__(self, *args, **kwargs):\\n+ if 'warn_unpinned' in kwargs:\\n+ kwargs['warn-unpinned'] = kwargs.pop('warn_unpinned')\\n super(GitPackage, self).__init__(*args, **kwargs)\\n self._checkout_name = hashlib.md5(six.b(self.git)).hexdigest()\\n self.version = self._contents.get('revision')\\n@@ -252,8 +255,12 @@ def nice_version_name(self):\\n return \\\"revision {}\\\".format(self.version_name())\\n \\n def incorporate(self, other):\\n+ # if one is True, make both be True.\\n+ warn_unpinned = self.warn_unpinned and other.warn_unpinned\\n+\\n return GitPackage(git=self.git,\\n- revision=(self.version + other.version))\\n+ revision=(self.version + other.version),\\n+ warn_unpinned=warn_unpinned)\\n \\n def _resolve_version(self):\\n requested = set(self.version)\\n@@ -263,6 +270,10 @@ def _resolve_version(self):\\n '{} contains: {}'.format(self.git, requested))\\n self.version = requested.pop()\\n \\n+ @property\\n+ def warn_unpinned(self):\\n+ return self.get('warn-unpinned', True)\\n+\\n def _checkout(self, project):\\n \\\"\\\"\\\"Performs a shallow clone of the repository into the downloads\\n directory. This function can be called repeatedly. If the project has\\n@@ -287,6 +298,13 @@ def _checkout(self, project):\\n \\n def _fetch_metadata(self, project):\\n path = self._checkout(project)\\n+ if self.version[0] == 'master' and self.warn_unpinned:\\n+ dbt.exceptions.warn_or_error(\\n+ 'Version for {} not pinned - \\\"master\\\" may introduce breaking '\\n+ 'changes without warning! See {}'\\n+ .format(self.git, PIN_PACKAGE_URL),\\n+ log_fmt='WARNING: {}'\\n+ )\\n loaded = project.from_project_root(path, {})\\n return ProjectPackageMetadata(loaded)\\n \\ndiff --git a/test/integration/006_simple_dependency_test/test_simple_dependency.py b/test/integration/006_simple_dependency_test/test_simple_dependency.py\\nindex cd0ac9847fa..75222dd9f91 100644\\n--- a/test/integration/006_simple_dependency_test/test_simple_dependency.py\\n+++ b/test/integration/006_simple_dependency_test/test_simple_dependency.py\\n@@ -1,5 +1,6 @@\\n import os\\n from test.integration.base import DBTIntegrationTest, use_profile\\n+from dbt.exceptions import CompilationException\\n \\n \\n class TestSimpleDependency(DBTIntegrationTest):\\n@@ -21,13 +22,14 @@ def packages_config(self):\\n return {\\n \\\"packages\\\": [\\n {\\n- 'git': 'https://github.com/fishtown-analytics/dbt-integration-project'\\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n+ 'warn-unpinned': False,\\n }\\n ]\\n }\\n \\n @use_profile('postgres')\\n- def test_simple_dependency(self):\\n+ def test_postgres_simple_dependency(self):\\n self.run_dbt([\\\"deps\\\"])\\n results = self.run_dbt([\\\"run\\\"])\\n self.assertEqual(len(results), 4)\\n@@ -49,7 +51,7 @@ def test_simple_dependency(self):\\n self.assertTablesEqual(\\\"seed\\\",\\\"incremental\\\")\\n \\n @use_profile('postgres')\\n- def test_simple_dependency_with_models(self):\\n+ def test_postgres_simple_dependency_with_models(self):\\n self.run_dbt([\\\"deps\\\"])\\n results = self.run_dbt([\\\"run\\\", '--models', 'view_model+'])\\n self.assertEqual(len(results), 2)\\n@@ -66,6 +68,37 @@ def test_simple_dependency_with_models(self):\\n self.assertEqual(created_models['view_summary'], 'view')\\n \\n \\n+class TestSimpleDependencyUnpinned(DBTIntegrationTest):\\n+ def setUp(self):\\n+ DBTIntegrationTest.setUp(self)\\n+ self.run_sql_file(\\\"test/integration/006_simple_dependency_test/seed.sql\\\")\\n+\\n+ @property\\n+ def schema(self):\\n+ return \\\"simple_dependency_006\\\"\\n+\\n+ @property\\n+ def models(self):\\n+ return \\\"test/integration/006_simple_dependency_test/models\\\"\\n+\\n+ @property\\n+ def packages_config(self):\\n+ return {\\n+ \\\"packages\\\": [\\n+ {\\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n+ 'warn-unpinned': True,\\n+ }\\n+ ]\\n+ }\\n+\\n+ @use_profile('postgres')\\n+ def test_postgres_simple_dependency(self):\\n+ self.run_dbt(['deps'], strict=False)\\n+ with self.assertRaises(CompilationException):\\n+ self.run_dbt([\\\"deps\\\"])\\n+\\n+\\n class TestSimpleDependencyWithDuplicates(DBTIntegrationTest):\\n @property\\n def schema(self):\\n@@ -81,10 +114,12 @@ def packages_config(self):\\n return {\\n \\\"packages\\\": [\\n {\\n- 'git': 'https://github.com/fishtown-analytics/dbt-integration-project'\\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n+ 'warn-unpinned': False,\\n },\\n {\\n- 'git': 'https://github.com/fishtown-analytics/dbt-integration-project.git'\\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project.git',\\n+ 'warn-unpinned': False,\\n }\\n ]\\n }\\n@@ -147,6 +182,7 @@ def packages_config(self):\\n {\\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n 'revision': 'master',\\n+ 'warn-unpinned': False,\\n },\\n ]\\n }\\n@@ -168,7 +204,7 @@ def deps_run_assert_equality(self):\\n self.assertEqual(created_models['incremental'], 'table')\\n \\n @use_profile('postgres')\\n- def test_simple_dependency(self):\\n+ def test_postgres_simple_dependency(self):\\n self.deps_run_assert_equality()\\n \\n self.assertTablesEqual(\\\"seed_summary\\\",\\\"view_summary\\\")\\n@@ -178,7 +214,7 @@ def test_simple_dependency(self):\\n self.deps_run_assert_equality()\\n \\n @use_profile('postgres')\\n- def test_empty_models_not_compiled_in_dependencies(self):\\n+ def test_postgres_empty_models_not_compiled_in_dependencies(self):\\n self.deps_run_assert_equality()\\n \\n models = self.get_models_in_schema()\\ndiff --git a/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py b/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py\\nindex bc5971bd6de..df4fcd90de1 100644\\n--- a/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py\\n+++ b/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py\\n@@ -17,7 +17,7 @@ def models(self):\\n def packages_config(self):\\n return {\\n \\\"packages\\\": [\\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'}\\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\\n ]\\n }\\n \\ndiff --git a/test/integration/008_schema_tests_test/test_schema_v2_tests.py b/test/integration/008_schema_tests_test/test_schema_v2_tests.py\\nindex 69836e42c44..88dca5845f3 100644\\n--- a/test/integration/008_schema_tests_test/test_schema_v2_tests.py\\n+++ b/test/integration/008_schema_tests_test/test_schema_v2_tests.py\\n@@ -145,6 +145,7 @@ def packages_config(self):\\n },\\n {\\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n+ 'warn-unpinned': False,\\n },\\n ]\\n }\\ndiff --git a/test/integration/016_macro_tests/test_macros.py b/test/integration/016_macro_tests/test_macros.py\\nindex e0cf958c1f9..e6d355f9221 100644\\n--- a/test/integration/016_macro_tests/test_macros.py\\n+++ b/test/integration/016_macro_tests/test_macros.py\\n@@ -19,7 +19,7 @@ def models(self):\\n def packages_config(self):\\n return {\\n 'packages': [\\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'},\\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\\n ]\\n }\\n \\n@@ -92,7 +92,7 @@ def models(self):\\n def packages_config(self):\\n return {\\n 'packages': [\\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'}\\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\\n ]\\n }\\n \\ndiff --git a/test/integration/023_exit_codes_test/test_exit_codes.py b/test/integration/023_exit_codes_test/test_exit_codes.py\\nindex bc54e01aa57..88e16e48e06 100644\\n--- a/test/integration/023_exit_codes_test/test_exit_codes.py\\n+++ b/test/integration/023_exit_codes_test/test_exit_codes.py\\n@@ -132,7 +132,7 @@ def models(self):\\n def packages_config(self):\\n return {\\n \\\"packages\\\": [\\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'}\\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\\n ]\\n }\\n \\ndiff --git a/test/integration/025_duplicate_model_test/test_duplicate_model.py b/test/integration/025_duplicate_model_test/test_duplicate_model.py\\nindex 5d438640ac1..0b368f3cfc1 100644\\n--- a/test/integration/025_duplicate_model_test/test_duplicate_model.py\\n+++ b/test/integration/025_duplicate_model_test/test_duplicate_model.py\\n@@ -103,6 +103,7 @@ def packages_config(self):\\n {\\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n 'revision': 'master',\\n+ 'warn-unpinned': False,\\n },\\n ],\\n }\\n@@ -139,6 +140,7 @@ def packages_config(self):\\n {\\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n 'revision': 'master',\\n+ 'warn-unpinned': False,\\n },\\n ],\\n }\\ndiff --git a/test/integration/029_docs_generate_tests/test_docs_generate.py b/test/integration/029_docs_generate_tests/test_docs_generate.py\\nindex 312ef1c8299..966f2070c4c 100644\\n--- a/test/integration/029_docs_generate_tests/test_docs_generate.py\\n+++ b/test/integration/029_docs_generate_tests/test_docs_generate.py\\n@@ -81,6 +81,7 @@ def packages_config(self):\\n 'packages': [\\n {\\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\\n+ 'warn-unpinned': False,\\n },\\n ],\\n }\\ndiff --git a/test/integration/033_event_tracking_test/test_events.py b/test/integration/033_event_tracking_test/test_events.py\\nindex 91121872623..03f9ad3a9d2 100644\\n--- a/test/integration/033_event_tracking_test/test_events.py\\n+++ b/test/integration/033_event_tracking_test/test_events.py\\n@@ -177,7 +177,7 @@ class TestEventTrackingSuccess(TestEventTracking):\\n def packages_config(self):\\n return {\\n 'packages': [\\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'},\\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False},\\n ],\\n }\\n \\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -252,8 +255,12 @@ def nice_version_name(self):\n return \"revision {}\".format(self.version_name())\n \n def incorporate(self, other):\n+ # if one is True, make both be True.\n+ warn_unpinned = self.warn_unpinned and other.warn_unpinned","line":260,"original_line":259,"original_start_line":null,"path":"core/dbt/task/deps.py","start_line":null,"text":"@user1:\nWhat's the intended logic here? This comment sounds to me like `self.warn_unpinned or other.warn_unpinned`, right? \n\n@author:\nWhoops! My thought was that it should be False if either was False since it means that at least someone knew what they were doing and didn't want to be bothered. I'm not sure why I wrote `True` twice there in that comment."}],"string":"[\n {\n \"diff_hunk\": \"@@ -252,8 +255,12 @@ def nice_version_name(self):\\n return \\\"revision {}\\\".format(self.version_name())\\n \\n def incorporate(self, other):\\n+ # if one is True, make both be True.\\n+ warn_unpinned = self.warn_unpinned and other.warn_unpinned\",\n \"line\": 260,\n \"original_line\": 259,\n \"original_start_line\": null,\n \"path\": \"core/dbt/task/deps.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nWhat's the intended logic here? This comment sounds to me like `self.warn_unpinned or other.warn_unpinned`, right? \\n\\n@author:\\nWhoops! My thought was that it should be False if either was False since it means that at least someone knew what they were doing and didn't want to be bothered. I'm not sure why I wrote `True` twice there in that comment.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"ea8825996d56f89a644a201fc2436e6de83ce6b6"},"merged_patch":{"kind":"string","value":"diff --git a/core/dbt/contracts/project.py b/core/dbt/contracts/project.py\nindex 9e79101f52a..3bda33e2500 100644\n--- a/core/dbt/contracts/project.py\n+++ b/core/dbt/contracts/project.py\n@@ -188,6 +188,9 @@ class Project(APIObject):\n 'items': {'type': 'string'},\n 'description': 'The git revision to use, if it is not tip',\n },\n+ 'warn-unpinned': {\n+ 'type': 'boolean',\n+ }\n },\n 'required': ['git'],\n }\ndiff --git a/core/dbt/task/deps.py b/core/dbt/task/deps.py\nindex aaf37979ef6..18ba004ae96 100644\n--- a/core/dbt/task/deps.py\n+++ b/core/dbt/task/deps.py\n@@ -15,6 +15,7 @@\n from dbt.compat import basestring\n from dbt.logger import GLOBAL_LOGGER as logger\n from dbt.semver import VersionSpecifier, UnboundedVersionSpecifier\n+from dbt.ui import printer\n from dbt.utils import AttrDict\n from dbt.api.object import APIObject\n from dbt.contracts.project import LOCAL_PACKAGE_CONTRACT, \\\n@@ -25,6 +26,7 @@\n \n DOWNLOADS_PATH = None\n REMOVE_DOWNLOADS = False\n+PIN_PACKAGE_URL = 'https://docs.getdbt.com/docs/package-management#section-specifying-package-versions' # noqa\n \n \n def _initialize_downloads():\n@@ -215,6 +217,8 @@ class GitPackage(Package):\n SCHEMA = GIT_PACKAGE_CONTRACT\n \n def __init__(self, *args, **kwargs):\n+ if 'warn_unpinned' in kwargs:\n+ kwargs['warn-unpinned'] = kwargs.pop('warn_unpinned')\n super(GitPackage, self).__init__(*args, **kwargs)\n self._checkout_name = hashlib.md5(six.b(self.git)).hexdigest()\n self.version = self._contents.get('revision')\n@@ -252,8 +256,12 @@ def nice_version_name(self):\n return \"revision {}\".format(self.version_name())\n \n def incorporate(self, other):\n+ # if one is False, make both be False.\n+ warn_unpinned = self.warn_unpinned and other.warn_unpinned\n+\n return GitPackage(git=self.git,\n- revision=(self.version + other.version))\n+ revision=(self.version + other.version),\n+ warn_unpinned=warn_unpinned)\n \n def _resolve_version(self):\n requested = set(self.version)\n@@ -263,6 +271,10 @@ def _resolve_version(self):\n '{} contains: {}'.format(self.git, requested))\n self.version = requested.pop()\n \n+ @property\n+ def warn_unpinned(self):\n+ return self.get('warn-unpinned', True)\n+\n def _checkout(self, project):\n \"\"\"Performs a shallow clone of the repository into the downloads\n directory. This function can be called repeatedly. If the project has\n@@ -287,6 +299,13 @@ def _checkout(self, project):\n \n def _fetch_metadata(self, project):\n path = self._checkout(project)\n+ if self.version[0] == 'master' and self.warn_unpinned:\n+ dbt.exceptions.warn_or_error(\n+ 'The git package \"{}\" is not pinned.\\n\\tThis can introduce '\n+ 'breaking changes into your project without warning!\\n\\nSee {}'\n+ .format(self.git, PIN_PACKAGE_URL),\n+ log_fmt=printer.yellow('WARNING: {}')\n+ )\n loaded = project.from_project_root(path, {})\n return ProjectPackageMetadata(loaded)\n \ndiff --git a/test/integration/006_simple_dependency_test/test_simple_dependency.py b/test/integration/006_simple_dependency_test/test_simple_dependency.py\nindex cd0ac9847fa..75222dd9f91 100644\n--- a/test/integration/006_simple_dependency_test/test_simple_dependency.py\n+++ b/test/integration/006_simple_dependency_test/test_simple_dependency.py\n@@ -1,5 +1,6 @@\n import os\n from test.integration.base import DBTIntegrationTest, use_profile\n+from dbt.exceptions import CompilationException\n \n \n class TestSimpleDependency(DBTIntegrationTest):\n@@ -21,13 +22,14 @@ def packages_config(self):\n return {\n \"packages\": [\n {\n- 'git': 'https://github.com/fishtown-analytics/dbt-integration-project'\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n+ 'warn-unpinned': False,\n }\n ]\n }\n \n @use_profile('postgres')\n- def test_simple_dependency(self):\n+ def test_postgres_simple_dependency(self):\n self.run_dbt([\"deps\"])\n results = self.run_dbt([\"run\"])\n self.assertEqual(len(results), 4)\n@@ -49,7 +51,7 @@ def test_simple_dependency(self):\n self.assertTablesEqual(\"seed\",\"incremental\")\n \n @use_profile('postgres')\n- def test_simple_dependency_with_models(self):\n+ def test_postgres_simple_dependency_with_models(self):\n self.run_dbt([\"deps\"])\n results = self.run_dbt([\"run\", '--models', 'view_model+'])\n self.assertEqual(len(results), 2)\n@@ -66,6 +68,37 @@ def test_simple_dependency_with_models(self):\n self.assertEqual(created_models['view_summary'], 'view')\n \n \n+class TestSimpleDependencyUnpinned(DBTIntegrationTest):\n+ def setUp(self):\n+ DBTIntegrationTest.setUp(self)\n+ self.run_sql_file(\"test/integration/006_simple_dependency_test/seed.sql\")\n+\n+ @property\n+ def schema(self):\n+ return \"simple_dependency_006\"\n+\n+ @property\n+ def models(self):\n+ return \"test/integration/006_simple_dependency_test/models\"\n+\n+ @property\n+ def packages_config(self):\n+ return {\n+ \"packages\": [\n+ {\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n+ 'warn-unpinned': True,\n+ }\n+ ]\n+ }\n+\n+ @use_profile('postgres')\n+ def test_postgres_simple_dependency(self):\n+ self.run_dbt(['deps'], strict=False)\n+ with self.assertRaises(CompilationException):\n+ self.run_dbt([\"deps\"])\n+\n+\n class TestSimpleDependencyWithDuplicates(DBTIntegrationTest):\n @property\n def schema(self):\n@@ -81,10 +114,12 @@ def packages_config(self):\n return {\n \"packages\": [\n {\n- 'git': 'https://github.com/fishtown-analytics/dbt-integration-project'\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n+ 'warn-unpinned': False,\n },\n {\n- 'git': 'https://github.com/fishtown-analytics/dbt-integration-project.git'\n+ 'git': 'https://github.com/fishtown-analytics/dbt-integration-project.git',\n+ 'warn-unpinned': False,\n }\n ]\n }\n@@ -147,6 +182,7 @@ def packages_config(self):\n {\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n 'revision': 'master',\n+ 'warn-unpinned': False,\n },\n ]\n }\n@@ -168,7 +204,7 @@ def deps_run_assert_equality(self):\n self.assertEqual(created_models['incremental'], 'table')\n \n @use_profile('postgres')\n- def test_simple_dependency(self):\n+ def test_postgres_simple_dependency(self):\n self.deps_run_assert_equality()\n \n self.assertTablesEqual(\"seed_summary\",\"view_summary\")\n@@ -178,7 +214,7 @@ def test_simple_dependency(self):\n self.deps_run_assert_equality()\n \n @use_profile('postgres')\n- def test_empty_models_not_compiled_in_dependencies(self):\n+ def test_postgres_empty_models_not_compiled_in_dependencies(self):\n self.deps_run_assert_equality()\n \n models = self.get_models_in_schema()\ndiff --git a/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py b/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py\nindex bc5971bd6de..df4fcd90de1 100644\n--- a/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py\n+++ b/test/integration/007_graph_selection_tests/test_schema_test_graph_selection.py\n@@ -17,7 +17,7 @@ def models(self):\n def packages_config(self):\n return {\n \"packages\": [\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'}\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\n ]\n }\n \ndiff --git a/test/integration/008_schema_tests_test/test_schema_v2_tests.py b/test/integration/008_schema_tests_test/test_schema_v2_tests.py\nindex 69836e42c44..88dca5845f3 100644\n--- a/test/integration/008_schema_tests_test/test_schema_v2_tests.py\n+++ b/test/integration/008_schema_tests_test/test_schema_v2_tests.py\n@@ -145,6 +145,7 @@ def packages_config(self):\n },\n {\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n+ 'warn-unpinned': False,\n },\n ]\n }\ndiff --git a/test/integration/016_macro_tests/test_macros.py b/test/integration/016_macro_tests/test_macros.py\nindex e0cf958c1f9..e6d355f9221 100644\n--- a/test/integration/016_macro_tests/test_macros.py\n+++ b/test/integration/016_macro_tests/test_macros.py\n@@ -19,7 +19,7 @@ def models(self):\n def packages_config(self):\n return {\n 'packages': [\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'},\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\n ]\n }\n \n@@ -92,7 +92,7 @@ def models(self):\n def packages_config(self):\n return {\n 'packages': [\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'}\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\n ]\n }\n \ndiff --git a/test/integration/023_exit_codes_test/test_exit_codes.py b/test/integration/023_exit_codes_test/test_exit_codes.py\nindex bc54e01aa57..88e16e48e06 100644\n--- a/test/integration/023_exit_codes_test/test_exit_codes.py\n+++ b/test/integration/023_exit_codes_test/test_exit_codes.py\n@@ -132,7 +132,7 @@ def models(self):\n def packages_config(self):\n return {\n \"packages\": [\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'}\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False}\n ]\n }\n \ndiff --git a/test/integration/025_duplicate_model_test/test_duplicate_model.py b/test/integration/025_duplicate_model_test/test_duplicate_model.py\nindex 5d438640ac1..0b368f3cfc1 100644\n--- a/test/integration/025_duplicate_model_test/test_duplicate_model.py\n+++ b/test/integration/025_duplicate_model_test/test_duplicate_model.py\n@@ -103,6 +103,7 @@ def packages_config(self):\n {\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n 'revision': 'master',\n+ 'warn-unpinned': False,\n },\n ],\n }\n@@ -139,6 +140,7 @@ def packages_config(self):\n {\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n 'revision': 'master',\n+ 'warn-unpinned': False,\n },\n ],\n }\ndiff --git a/test/integration/029_docs_generate_tests/test_docs_generate.py b/test/integration/029_docs_generate_tests/test_docs_generate.py\nindex 312ef1c8299..966f2070c4c 100644\n--- a/test/integration/029_docs_generate_tests/test_docs_generate.py\n+++ b/test/integration/029_docs_generate_tests/test_docs_generate.py\n@@ -81,6 +81,7 @@ def packages_config(self):\n 'packages': [\n {\n 'git': 'https://github.com/fishtown-analytics/dbt-integration-project',\n+ 'warn-unpinned': False,\n },\n ],\n }\ndiff --git a/test/integration/033_event_tracking_test/test_events.py b/test/integration/033_event_tracking_test/test_events.py\nindex 91121872623..03f9ad3a9d2 100644\n--- a/test/integration/033_event_tracking_test/test_events.py\n+++ b/test/integration/033_event_tracking_test/test_events.py\n@@ -177,7 +177,7 @@ class TestEventTrackingSuccess(TestEventTracking):\n def packages_config(self):\n return {\n 'packages': [\n- {'git': 'https://github.com/fishtown-analytics/dbt-integration-project'},\n+ {'git': 'https://github.com/fishtown-analytics/dbt-integration-project', 'warn-unpinned': False},\n ],\n }\n \n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2375,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-1452@d74e37d"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":1452,"string":"1,452"},"title":{"kind":"string","value":"Handle seeds with utf-8 BOM (#1177)"},"body":{"kind":"string","value":"Fixes #1177 \r\n\r\nInstead of passing agate a filepath, open the file at that path, look at the first byte, and seek back if it's not a BOM. Regardless, pass the file handle to agate instead.\r\n\r\nThat way when agate gets the file handle, if there is a BOM, it won't see it."},"created_at":{"kind":"string","value":"2019-05-10T00:01:58Z"},"problem_statement":{"kind":"string","value":"Strip BOM from Excel-generated UTF-8 CSV files\n## Issue\r\n\r\nUTF-8 CSV files generated by Excel have a byte order mark (BOM) which is included in the column title when using `dbt seed`.\r\n\r\n### Issue description\r\n\r\nSave Excel file as UTF-8 CSV on Microsoft Excel for Mac. Run `dbt seed` on the resulting file.\r\n\r\n### Results\r\n\r\nThe first column name includes the unprintable BOM character which makes queries very difficult to write. I would expect the BOM to be stripped from the column name.\r\n\r\nI was able to work around this by changing the file encoding in Emacs and re-saving the file.\r\n\r\n### System information\r\nThe output of `dbt --version`:\r\n```\r\ninstalled version: 0.12.1\r\n latest version: 0.12.1\r\n\r\nUp to date!\r\n```\r\n\r\nThe operating system you're running on: MacOS Mojave 10.14.1\r\n\r\nThe python version you're using (probably the output of `python --version`): 3.7.1\r\n\r\n### Steps to reproduce\r\n\r\n1. Using Excel, save file as UTF-8 CSV.\r\n2. Run `dbt seed`\r\n3. `select <column> from <table>`, column cannot be found because of the BOM."},"hints_text":{"kind":"string","value":"I (fortunately) don't have an excel-generated csv lying around to test this on, but had written down some notes about this before.\r\n\r\nI *think* the following enables you to read excel-generated csv files as expected, for what it's worth:\r\n\r\n```\r\n>>> import codecs\r\n>>> import csv\r\n>>> with codecs.open('excel_output.csv', encoding='utf-8-sig') as f:\r\n... reader = csv.reader(f)\r\n... rows = [row for row in reader]\r\n```"},"resolved_issues":{"kind":"list like","value":[{"body":"## Issue\r\n\r\nUTF-8 CSV files generated by Excel have a byte order mark (BOM) which is included in the column title when using `dbt seed`.\r\n\r\n### Issue description\r\n\r\nSave Excel file as UTF-8 CSV on Microsoft Excel for Mac. Run `dbt seed` on the resulting file.\r\n\r\n### Results\r\n\r\nThe first column name includes the unprintable BOM character which makes queries very difficult to write. I would expect the BOM to be stripped from the column name.\r\n\r\nI was able to work around this by changing the file encoding in Emacs and re-saving the file.\r\n\r\n### System information\r\nThe output of `dbt --version`:\r\n```\r\ninstalled version: 0.12.1\r\n latest version: 0.12.1\r\n\r\nUp to date!\r\n```\r\n\r\nThe operating system you're running on: MacOS Mojave 10.14.1\r\n\r\nThe python version you're using (probably the output of `python --version`): 3.7.1\r\n\r\n### Steps to reproduce\r\n\r\n1. Using Excel, save file as UTF-8 CSV.\r\n2. Run `dbt seed`\r\n3. `select <column> from <table>`, column cannot be found because of the BOM.","number":1177,"title":"Strip BOM from Excel-generated UTF-8 CSV files"}],"string":"[\n {\n \"body\": \"## Issue\\r\\n\\r\\nUTF-8 CSV files generated by Excel have a byte order mark (BOM) which is included in the column title when using `dbt seed`.\\r\\n\\r\\n### Issue description\\r\\n\\r\\nSave Excel file as UTF-8 CSV on Microsoft Excel for Mac. Run `dbt seed` on the resulting file.\\r\\n\\r\\n### Results\\r\\n\\r\\nThe first column name includes the unprintable BOM character which makes queries very difficult to write. I would expect the BOM to be stripped from the column name.\\r\\n\\r\\nI was able to work around this by changing the file encoding in Emacs and re-saving the file.\\r\\n\\r\\n### System information\\r\\nThe output of `dbt --version`:\\r\\n```\\r\\ninstalled version: 0.12.1\\r\\n latest version: 0.12.1\\r\\n\\r\\nUp to date!\\r\\n```\\r\\n\\r\\nThe operating system you're running on: MacOS Mojave 10.14.1\\r\\n\\r\\nThe python version you're using (probably the output of `python --version`): 3.7.1\\r\\n\\r\\n### Steps to reproduce\\r\\n\\r\\n1. Using Excel, save file as UTF-8 CSV.\\r\\n2. Run `dbt seed`\\r\\n3. `select <column> from <table>`, column cannot be found because of the BOM.\",\n \"number\": 1177,\n \"title\": \"Strip BOM from Excel-generated UTF-8 CSV files\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"cc8ef4774798059b4a0ee4364b6944a487b2fa6b"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"d74e37d4ea6f5cc588fa102f7003f0978ed4cf8f\",\n \"head_commit_message\": \"Always specify encodings to open()\\n\\nFixes some neat windows behavior where the default code page can be cp1252\\nAdd BOM unit test\",\n \"patch_to_review\": \"diff --git a/core/dbt/clients/agate_helper.py b/core/dbt/clients/agate_helper.py\\nindex e08c500f485..0d0d212c6c1 100644\\n--- a/core/dbt/clients/agate_helper.py\\n+++ b/core/dbt/clients/agate_helper.py\\n@@ -1,3 +1,4 @@\\n+import dbt.compat\\n \\n import agate\\n \\n@@ -41,4 +42,7 @@ def as_matrix(table):\\n \\n \\n def from_csv(abspath):\\n- return agate.Table.from_csv(abspath, column_types=DEFAULT_TYPE_TESTER)\\n+ with dbt.compat.open_file(abspath) as fp:\\n+ if fp.read(1) != u'\\\\ufeff':\\n+ fp.seek(0)\\n+ return agate.Table.from_csv(fp, column_types=DEFAULT_TYPE_TESTER)\\ndiff --git a/core/dbt/compat.py b/core/dbt/compat.py\\nindex 50f9c217914..b2533c6d8b9 100644\\n--- a/core/dbt/compat.py\\n+++ b/core/dbt/compat.py\\n@@ -82,11 +82,20 @@ def to_native_string(s):\\n \\n def write_file(path, s):\\n if WHICH_PYTHON == 2:\\n- with codecs.open(path, 'w', encoding='utf-8') as f:\\n- return f.write(to_string(s))\\n+ open = codecs.open\\n else:\\n- with open(path, 'w') as f:\\n- return f.write(to_string(s))\\n+ open = builtins.open\\n+ with open(path, 'w', encoding='utf-8') as f:\\n+ return f.write(to_string(s))\\n+\\n+\\n+def open_file(path):\\n+ \\\"\\\"\\\"Open the path for reading. It must be utf-8 encoded.\\\"\\\"\\\"\\n+ if WHICH_PYTHON == 2:\\n+ open = codecs.open\\n+ else:\\n+ open = builtins.open\\n+ return open(path, encoding='utf-8')\\n \\n \\n if WHICH_PYTHON == 2:\\ndiff --git a/test/integration/005_simple_seed_test/data-bom/seed_bom.csv b/test/integration/005_simple_seed_test/data-bom/seed_bom.csv\\nnew file mode 100644\\nindex 00000000000..1d37f5f2874\\n--- /dev/null\\n+++ b/test/integration/005_simple_seed_test/data-bom/seed_bom.csv\\n@@ -0,0 +1,501 @@\\n+id,first_name,email,ip_address,birthday\\n+1,Larry,lking0@miitbeian.gov.cn,69.135.206.194,2008-09-12 19:08:31\\n+2,Larry,lperkins1@toplist.cz,64.210.133.162,1978-05-09 04:15:14\\n+3,Anna,amontgomery2@miitbeian.gov.cn,168.104.64.114,2011-10-16 04:07:57\\n+4,Sandra,sgeorge3@livejournal.com,229.235.252.98,1973-07-19 10:52:43\\n+5,Fred,fwoods4@google.cn,78.229.170.124,2012-09-30 16:38:29\\n+6,Stephen,shanson5@livejournal.com,182.227.157.105,1995-11-07 21:40:50\\n+7,William,wmartinez6@upenn.edu,135.139.249.50,1982-09-05 03:11:59\\n+8,Jessica,jlong7@hao123.com,203.62.178.210,1991-10-16 11:03:15\\n+9,Douglas,dwhite8@tamu.edu,178.187.247.1,1979-10-01 09:49:48\\n+10,Lisa,lcoleman9@nydailynews.com,168.234.128.249,2011-05-26 07:45:49\\n+11,Ralph,rfieldsa@home.pl,55.152.163.149,1972-11-18 19:06:11\\n+12,Louise,lnicholsb@samsung.com,141.116.153.154,2014-11-25 20:56:14\\n+13,Clarence,cduncanc@sfgate.com,81.171.31.133,2011-11-17 07:02:36\\n+14,Daniel,dfranklind@omniture.com,8.204.211.37,1980-09-13 00:09:04\\n+15,Katherine,klanee@auda.org.au,176.96.134.59,1997-08-22 19:36:56\\n+16,Billy,bwardf@wikia.com,214.108.78.85,2003-10-19 02:14:47\\n+17,Annie,agarzag@ocn.ne.jp,190.108.42.70,1988-10-28 15:12:35\\n+18,Shirley,scolemanh@fastcompany.com,109.251.164.84,1988-08-24 10:50:57\\n+19,Roger,rfrazieri@scribd.com,38.145.218.108,1985-12-31 15:17:15\\n+20,Lillian,lstanleyj@goodreads.com,47.57.236.17,1970-06-08 02:09:05\\n+21,Aaron,arodriguezk@nps.gov,205.245.118.221,1985-10-11 23:07:49\\n+22,Patrick,pparkerl@techcrunch.com,19.8.100.182,2006-03-29 12:53:56\\n+23,Phillip,pmorenom@intel.com,41.38.254.103,2011-11-07 15:35:43\\n+24,Henry,hgarcian@newsvine.com,1.191.216.252,2008-08-28 08:30:44\\n+25,Irene,iturnero@opera.com,50.17.60.190,1994-04-01 07:15:02\\n+26,Andrew,adunnp@pen.io,123.52.253.176,2000-11-01 06:03:25\\n+27,David,dgutierrezq@wp.com,238.23.203.42,1988-01-25 07:29:18\\n+28,Henry,hsanchezr@cyberchimps.com,248.102.2.185,1983-01-01 13:36:37\\n+29,Evelyn,epetersons@gizmodo.com,32.80.46.119,1979-07-16 17:24:12\\n+30,Tammy,tmitchellt@purevolume.com,249.246.167.88,2001-04-03 10:00:23\\n+31,Jacqueline,jlittleu@domainmarket.com,127.181.97.47,1986-02-11 21:35:50\\n+32,Earl,eortizv@opera.com,166.47.248.240,1996-07-06 08:16:27\\n+33,Juan,jgordonw@sciencedirect.com,71.77.2.200,1987-01-31 03:46:44\\n+34,Diane,dhowellx@nyu.edu,140.94.133.12,1994-06-11 02:30:05\\n+35,Randy,rkennedyy@microsoft.com,73.255.34.196,2005-05-26 20:28:39\\n+36,Janice,jriveraz@time.com,22.214.227.32,1990-02-09 04:16:52\\n+37,Laura,lperry10@diigo.com,159.148.145.73,2015-03-17 05:59:25\\n+38,Gary,gray11@statcounter.com,40.193.124.56,1970-01-27 10:04:51\\n+39,Jesse,jmcdonald12@typepad.com,31.7.86.103,2009-03-14 08:14:29\\n+40,Sandra,sgonzalez13@goodreads.com,223.80.168.239,1993-05-21 14:08:54\\n+41,Scott,smoore14@archive.org,38.238.46.83,1980-08-30 11:16:56\\n+42,Phillip,pevans15@cisco.com,158.234.59.34,2011-12-15 23:26:31\\n+43,Steven,sriley16@google.ca,90.247.57.68,2011-10-29 19:03:28\\n+44,Deborah,dbrown17@hexun.com,179.125.143.240,1995-04-10 14:36:07\\n+45,Lori,lross18@ow.ly,64.80.162.180,1980-12-27 16:49:15\\n+46,Sean,sjackson19@tumblr.com,240.116.183.69,1988-06-12 21:24:45\\n+47,Terry,tbarnes1a@163.com,118.38.213.137,1997-09-22 16:43:19\\n+48,Dorothy,dross1b@ebay.com,116.81.76.49,2005-02-28 13:33:24\\n+49,Samuel,swashington1c@house.gov,38.191.253.40,1989-01-19 21:15:48\\n+50,Ralph,rcarter1d@tinyurl.com,104.84.60.174,2007-08-11 10:21:49\\n+51,Wayne,whudson1e@princeton.edu,90.61.24.102,1983-07-03 16:58:12\\n+52,Rose,rjames1f@plala.or.jp,240.83.81.10,1995-06-08 11:46:23\\n+53,Louise,lcox1g@theglobeandmail.com,105.11.82.145,2016-09-19 14:45:51\\n+54,Kenneth,kjohnson1h@independent.co.uk,139.5.45.94,1976-08-17 11:26:19\\n+55,Donna,dbrown1i@amazon.co.uk,19.45.169.45,2006-05-27 16:51:40\\n+56,Johnny,jvasquez1j@trellian.com,118.202.238.23,1975-11-17 08:42:32\\n+57,Patrick,pramirez1k@tamu.edu,231.25.153.198,1997-08-06 11:51:09\\n+58,Helen,hlarson1l@prweb.com,8.40.21.39,1993-08-04 19:53:40\\n+59,Patricia,pspencer1m@gmpg.org,212.198.40.15,1977-08-03 16:37:27\\n+60,Joseph,jspencer1n@marriott.com,13.15.63.238,2005-07-23 20:22:06\\n+61,Phillip,pschmidt1o@blogtalkradio.com,177.98.201.190,1976-05-19 21:47:44\\n+62,Joan,jwebb1p@google.ru,105.229.170.71,1972-09-07 17:53:47\\n+63,Phyllis,pkennedy1q@imgur.com,35.145.8.244,2000-01-01 22:33:37\\n+64,Katherine,khunter1r@smh.com.au,248.168.205.32,1991-01-09 06:40:24\\n+65,Laura,lvasquez1s@wiley.com,128.129.115.152,1997-10-23 12:04:56\\n+66,Juan,jdunn1t@state.gov,44.228.124.51,2004-11-10 05:07:35\\n+67,Judith,jholmes1u@wiley.com,40.227.179.115,1977-08-02 17:01:45\\n+68,Beverly,bbaker1v@wufoo.com,208.34.84.59,2016-03-06 20:07:23\\n+69,Lawrence,lcarr1w@flickr.com,59.158.212.223,1988-09-13 06:07:21\\n+70,Gloria,gwilliams1x@mtv.com,245.231.88.33,1995-03-18 22:32:46\\n+71,Steven,ssims1y@cbslocal.com,104.50.58.255,2001-08-05 21:26:20\\n+72,Betty,bmills1z@arstechnica.com,103.177.214.220,1981-12-14 21:26:54\\n+73,Mildred,mfuller20@prnewswire.com,151.158.8.130,2000-04-19 10:13:55\\n+74,Donald,dday21@icq.com,9.178.102.255,1972-12-03 00:58:24\\n+75,Eric,ethomas22@addtoany.com,85.2.241.227,1992-11-01 05:59:30\\n+76,Joyce,jarmstrong23@sitemeter.com,169.224.20.36,1985-10-24 06:50:01\\n+77,Maria,mmartinez24@amazonaws.com,143.189.167.135,2005-10-05 05:17:42\\n+78,Harry,hburton25@youtube.com,156.47.176.237,1978-03-26 05:53:33\\n+79,Kevin,klawrence26@hao123.com,79.136.183.83,1994-10-12 04:38:52\\n+80,David,dhall27@prweb.com,133.149.172.153,1976-12-15 16:24:24\\n+81,Kathy,kperry28@twitter.com,229.242.72.228,1979-03-04 02:58:56\\n+82,Adam,aprice29@elegantthemes.com,13.145.21.10,1982-11-07 11:46:59\\n+83,Brandon,bgriffin2a@va.gov,73.249.128.212,2013-10-30 05:30:36\\n+84,Henry,hnguyen2b@discovery.com,211.36.214.242,1985-01-09 06:37:27\\n+85,Eric,esanchez2c@edublogs.org,191.166.188.251,2004-05-01 23:21:42\\n+86,Jason,jlee2d@jimdo.com,193.92.16.182,1973-01-08 09:05:39\\n+87,Diana,drichards2e@istockphoto.com,19.130.175.245,1994-10-05 22:50:49\\n+88,Andrea,awelch2f@abc.net.au,94.155.233.96,2002-04-26 08:41:44\\n+89,Louis,lwagner2g@miitbeian.gov.cn,26.217.34.111,2003-08-25 07:56:39\\n+90,Jane,jsims2h@seesaa.net,43.4.220.135,1987-03-20 20:39:04\\n+91,Larry,lgrant2i@si.edu,97.126.79.34,2000-09-07 20:26:19\\n+92,Louis,ldean2j@prnewswire.com,37.148.40.127,2011-09-16 20:12:14\\n+93,Jennifer,jcampbell2k@xing.com,38.106.254.142,1988-07-15 05:06:49\\n+94,Wayne,wcunningham2l@google.com.hk,223.28.26.187,2009-12-15 06:16:54\\n+95,Lori,lstevens2m@icq.com,181.250.181.58,1984-10-28 03:29:19\\n+96,Judy,jsimpson2n@marriott.com,180.121.239.219,1986-02-07 15:18:10\\n+97,Phillip,phoward2o@usa.gov,255.247.0.175,2002-12-26 08:44:45\\n+98,Gloria,gwalker2p@usa.gov,156.140.7.128,1997-10-04 07:58:58\\n+99,Paul,pjohnson2q@umn.edu,183.59.198.197,1991-11-14 12:33:55\\n+100,Frank,fgreene2r@blogspot.com,150.143.68.121,2010-06-12 23:55:39\\n+101,Deborah,dknight2s@reverbnation.com,222.131.211.191,1970-07-08 08:54:23\\n+102,Sandra,sblack2t@tripadvisor.com,254.183.128.254,2000-04-12 02:39:36\\n+103,Edward,eburns2u@dailymotion.com,253.89.118.18,1993-10-10 10:54:01\\n+104,Anthony,ayoung2v@ustream.tv,118.4.193.176,1978-08-26 17:07:29\\n+105,Donald,dlawrence2w@wp.com,139.200.159.227,2007-07-21 20:56:20\\n+106,Matthew,mfreeman2x@google.fr,205.26.239.92,2014-12-05 17:05:39\\n+107,Sean,ssanders2y@trellian.com,143.89.82.108,1993-07-14 21:45:02\\n+108,Sharon,srobinson2z@soundcloud.com,66.234.247.54,1977-04-06 19:07:03\\n+109,Jennifer,jwatson30@t-online.de,196.102.127.7,1998-03-07 05:12:23\\n+110,Clarence,cbrooks31@si.edu,218.93.234.73,2002-11-06 17:22:25\\n+111,Jose,jflores32@goo.gl,185.105.244.231,1995-01-05 06:32:21\\n+112,George,glee33@adobe.com,173.82.249.196,2015-01-04 02:47:46\\n+113,Larry,lhill34@linkedin.com,66.5.206.195,2010-11-02 10:21:17\\n+114,Marie,mmeyer35@mysql.com,151.152.88.107,1990-05-22 20:52:51\\n+115,Clarence,cwebb36@skype.com,130.198.55.217,1972-10-27 07:38:54\\n+116,Sarah,scarter37@answers.com,80.89.18.153,1971-08-24 19:29:30\\n+117,Henry,hhughes38@webeden.co.uk,152.60.114.174,1973-01-27 09:00:42\\n+118,Teresa,thenry39@hao123.com,32.187.239.106,2015-11-06 01:48:44\\n+119,Billy,bgutierrez3a@sun.com,52.37.70.134,2002-03-19 03:20:19\\n+120,Anthony,agibson3b@github.io,154.251.232.213,1991-04-19 01:08:15\\n+121,Sandra,sromero3c@wikia.com,44.124.171.2,1998-09-06 20:30:34\\n+122,Paula,pandrews3d@blogs.com,153.142.118.226,2003-06-24 16:31:24\\n+123,Terry,tbaker3e@csmonitor.com,99.120.45.219,1970-12-09 23:57:21\\n+124,Lois,lwilson3f@reuters.com,147.44.171.83,1971-01-09 22:28:51\\n+125,Sara,smorgan3g@nature.com,197.67.192.230,1992-01-28 20:33:24\\n+126,Charles,ctorres3h@china.com.cn,156.115.216.2,1993-10-02 19:36:34\\n+127,Richard,ralexander3i@marriott.com,248.235.180.59,1999-02-03 18:40:55\\n+128,Christina,charper3j@cocolog-nifty.com,152.114.116.129,1978-09-13 00:37:32\\n+129,Steve,sadams3k@economist.com,112.248.91.98,2004-03-21 09:07:43\\n+130,Katherine,krobertson3l@ow.ly,37.220.107.28,1977-03-18 19:28:50\\n+131,Donna,dgibson3m@state.gov,222.218.76.221,1999-02-01 06:46:16\\n+132,Christina,cwest3n@mlb.com,152.114.6.160,1979-12-24 15:30:35\\n+133,Sandra,swillis3o@meetup.com,180.71.49.34,1984-09-27 08:05:54\\n+134,Clarence,cedwards3p@smugmug.com,10.64.180.186,1979-04-16 16:52:10\\n+135,Ruby,rjames3q@wp.com,98.61.54.20,2007-01-13 14:25:52\\n+136,Sarah,smontgomery3r@tripod.com,91.45.164.172,2009-07-25 04:34:30\\n+137,Sarah,soliver3s@eventbrite.com,30.106.39.146,2012-05-09 22:12:33\\n+138,Deborah,dwheeler3t@biblegateway.com,59.105.213.173,1999-11-09 08:08:44\\n+139,Deborah,dray3u@i2i.jp,11.108.186.217,2014-02-04 03:15:19\\n+140,Paul,parmstrong3v@alexa.com,6.250.59.43,2009-12-21 10:08:53\\n+141,Aaron,abishop3w@opera.com,207.145.249.62,1996-04-25 23:20:23\\n+142,Henry,hsanders3x@google.ru,140.215.203.171,2012-01-29 11:52:32\\n+143,Anne,aanderson3y@1688.com,74.150.102.118,1982-04-03 13:46:17\\n+144,Victor,vmurphy3z@hugedomains.com,222.155.99.152,1987-11-03 19:58:41\\n+145,Evelyn,ereid40@pbs.org,249.122.33.117,1977-12-14 17:09:57\\n+146,Brian,bgonzalez41@wikia.com,246.254.235.141,1991-02-24 00:45:58\\n+147,Sandra,sgray42@squarespace.com,150.73.28.159,1972-07-28 17:26:32\\n+148,Alice,ajones43@a8.net,78.253.12.177,2002-12-05 16:57:46\\n+149,Jessica,jhanson44@mapquest.com,87.229.30.160,1994-01-30 11:40:04\\n+150,Louise,lbailey45@reuters.com,191.219.31.101,2011-09-07 21:11:45\\n+151,Christopher,cgonzalez46@printfriendly.com,83.137.213.239,1984-10-24 14:58:04\\n+152,Gregory,gcollins47@yandex.ru,28.176.10.115,1998-07-25 17:17:10\\n+153,Jane,jperkins48@usnews.com,46.53.164.159,1979-08-19 15:25:00\\n+154,Phyllis,plong49@yahoo.co.jp,208.140.88.2,1985-07-06 02:16:36\\n+155,Adam,acarter4a@scribd.com,78.48.148.204,2005-07-20 03:31:09\\n+156,Frank,fweaver4b@angelfire.com,199.180.255.224,2011-03-04 23:07:54\\n+157,Ronald,rmurphy4c@cloudflare.com,73.42.97.231,1991-01-11 10:39:41\\n+158,Richard,rmorris4d@e-recht24.de,91.9.97.223,2009-01-17 21:05:15\\n+159,Rose,rfoster4e@woothemes.com,203.169.53.16,1991-04-21 02:09:38\\n+160,George,ggarrett4f@uiuc.edu,186.61.5.167,1989-11-11 11:29:42\\n+161,Victor,vhamilton4g@biblegateway.com,121.229.138.38,2012-06-22 18:01:23\\n+162,Mark,mbennett4h@businessinsider.com,209.184.29.203,1980-04-16 15:26:34\\n+163,Martin,mwells4i@ifeng.com,97.223.55.105,2010-05-26 14:08:18\\n+164,Diana,dstone4j@google.ru,90.155.52.47,2013-02-11 00:14:54\\n+165,Walter,wferguson4k@blogger.com,30.63.212.44,1986-02-20 17:46:46\\n+166,Denise,dcoleman4l@vistaprint.com,10.209.153.77,1992-05-13 20:14:14\\n+167,Philip,pknight4m@xing.com,15.28.135.167,2000-09-11 18:41:13\\n+168,Russell,rcarr4n@youtube.com,113.55.165.50,2008-07-10 17:49:27\\n+169,Donna,dburke4o@dion.ne.jp,70.0.105.111,1992-02-10 17:24:58\\n+170,Anne,along4p@squidoo.com,36.154.58.107,2012-08-19 23:35:31\\n+171,Clarence,cbanks4q@webeden.co.uk,94.57.53.114,1972-03-11 21:46:44\\n+172,Betty,bbowman4r@cyberchimps.com,178.115.209.69,2013-01-13 21:34:51\\n+173,Andrew,ahudson4s@nytimes.com,84.32.252.144,1998-09-15 14:20:04\\n+174,Keith,kgordon4t@cam.ac.uk,189.237.211.102,2009-01-22 05:34:38\\n+175,Patrick,pwheeler4u@mysql.com,47.22.117.226,1984-09-05 22:33:15\\n+176,Jesse,jfoster4v@mapquest.com,229.95.131.46,1990-01-20 12:19:15\\n+177,Arthur,afisher4w@jugem.jp,107.255.244.98,1983-10-13 11:08:46\\n+178,Nicole,nryan4x@wsj.com,243.211.33.221,1974-05-30 23:19:14\\n+179,Bruce,bjohnson4y@sfgate.com,17.41.200.101,1992-09-23 02:02:19\\n+180,Terry,tcox4z@reference.com,20.189.120.106,1982-02-13 12:43:14\\n+181,Ashley,astanley50@kickstarter.com,86.3.56.98,1976-05-09 01:27:16\\n+182,Michael,mrivera51@about.me,72.118.249.0,1971-11-11 17:28:37\\n+183,Steven,sgonzalez52@mozilla.org,169.112.247.47,2002-08-24 14:59:25\\n+184,Kathleen,kfuller53@bloglovin.com,80.93.59.30,2002-03-11 13:41:29\\n+185,Nicole,nhenderson54@usda.gov,39.253.60.30,1995-04-24 05:55:07\\n+186,Ralph,rharper55@purevolume.com,167.147.142.189,1980-02-10 18:35:45\\n+187,Heather,hcunningham56@photobucket.com,96.222.196.229,2007-06-15 05:37:50\\n+188,Nancy,nlittle57@cbc.ca,241.53.255.175,2007-07-12 23:42:48\\n+189,Juan,jramirez58@pinterest.com,190.128.84.27,1978-11-07 23:37:37\\n+190,Beverly,bfowler59@chronoengine.com,54.144.230.49,1979-03-31 23:27:28\\n+191,Shirley,sstevens5a@prlog.org,200.97.231.248,2011-12-06 07:08:50\\n+192,Annie,areyes5b@squidoo.com,223.32.182.101,2011-05-28 02:42:09\\n+193,Jack,jkelley5c@tiny.cc,47.34.118.150,1981-12-05 17:31:40\\n+194,Keith,krobinson5d@1und1.de,170.210.209.31,1999-03-09 11:05:43\\n+195,Joseph,jmiller5e@google.com.au,136.74.212.139,1984-10-08 13:18:20\\n+196,Annie,aday5f@blogspot.com,71.99.186.69,1986-02-18 12:27:34\\n+197,Nancy,nperez5g@liveinternet.ru,28.160.6.107,1983-10-20 17:51:20\\n+198,Tammy,tward5h@ucoz.ru,141.43.164.70,1980-03-31 04:45:29\\n+199,Doris,dryan5i@ted.com,239.117.202.188,1985-07-03 03:17:53\\n+200,Rose,rmendoza5j@photobucket.com,150.200.206.79,1973-04-21 21:36:40\\n+201,Cynthia,cbutler5k@hubpages.com,80.153.174.161,2001-01-20 01:42:26\\n+202,Samuel,soliver5l@people.com.cn,86.127.246.140,1970-09-02 02:19:00\\n+203,Carl,csanchez5m@mysql.com,50.149.237.107,1993-12-01 07:02:09\\n+204,Kathryn,kowens5n@geocities.jp,145.166.205.201,2004-07-06 18:39:33\\n+205,Nicholas,nnichols5o@parallels.com,190.240.66.170,2014-11-11 18:52:19\\n+206,Keith,kwillis5p@youtube.com,181.43.206.100,1998-06-13 06:30:51\\n+207,Justin,jwebb5q@intel.com,211.54.245.74,2000-11-04 16:58:26\\n+208,Gary,ghicks5r@wikipedia.org,196.154.213.104,1992-12-01 19:48:28\\n+209,Martin,mpowell5s@flickr.com,153.67.12.241,1983-06-30 06:24:32\\n+210,Brenda,bkelley5t@xinhuanet.com,113.100.5.172,2005-01-08 20:50:22\\n+211,Edward,eray5u@a8.net,205.187.246.65,2011-09-26 08:04:44\\n+212,Steven,slawson5v@senate.gov,238.150.250.36,1978-11-22 02:48:09\\n+213,Robert,rthompson5w@furl.net,70.7.89.236,2001-09-12 08:52:07\\n+214,Jack,jporter5x@diigo.com,220.172.29.99,1976-07-26 14:29:21\\n+215,Lisa,ljenkins5y@oakley.com,150.151.170.180,2010-03-20 19:21:16\\n+216,Theresa,tbell5z@mayoclinic.com,247.25.53.173,2001-03-11 05:36:40\\n+217,Jimmy,jstephens60@weather.com,145.101.93.235,1983-04-12 09:35:30\\n+218,Louis,lhunt61@amazon.co.jp,78.137.6.253,1997-08-29 19:34:34\\n+219,Lawrence,lgilbert62@ted.com,243.132.8.78,2015-04-08 22:06:56\\n+220,David,dgardner63@4shared.com,204.40.46.136,1971-07-09 03:29:11\\n+221,Charles,ckennedy64@gmpg.org,211.83.233.2,2011-02-26 11:55:04\\n+222,Lillian,lbanks65@msu.edu,124.233.12.80,2010-05-16 20:29:02\\n+223,Ernest,enguyen66@baidu.com,82.45.128.148,1996-07-04 10:07:04\\n+224,Ryan,rrussell67@cloudflare.com,202.53.240.223,1983-08-05 12:36:29\\n+225,Donald,ddavis68@ustream.tv,47.39.218.137,1989-05-27 02:30:56\\n+226,Joe,jscott69@blogspot.com,140.23.131.75,1973-03-16 12:21:31\\n+227,Anne,amarshall6a@google.ca,113.162.200.197,1988-12-09 03:38:29\\n+228,Willie,wturner6b@constantcontact.com,85.83.182.249,1991-10-06 01:51:10\\n+229,Nicole,nwilson6c@sogou.com,30.223.51.135,1977-05-29 19:54:56\\n+230,Janet,jwheeler6d@stumbleupon.com,153.194.27.144,2011-03-13 12:48:47\\n+231,Lois,lcarr6e@statcounter.com,0.41.36.53,1993-02-06 04:52:01\\n+232,Shirley,scruz6f@tmall.com,37.156.39.223,2007-02-18 17:47:01\\n+233,Patrick,pford6g@reverbnation.com,36.198.200.89,1977-03-06 15:47:24\\n+234,Lisa,lhudson6h@usatoday.com,134.213.58.137,2014-10-28 01:56:56\\n+235,Pamela,pmartinez6i@opensource.org,5.151.127.202,1987-11-30 16:44:47\\n+236,Larry,lperez6j@infoseek.co.jp,235.122.96.148,1979-01-18 06:33:45\\n+237,Pamela,pramirez6k@census.gov,138.233.34.163,2012-01-29 10:35:20\\n+238,Daniel,dcarr6l@php.net,146.21.152.242,1984-11-17 08:22:59\\n+239,Patrick,psmith6m@indiegogo.com,136.222.199.36,2001-05-30 22:16:44\\n+240,Raymond,rhenderson6n@hc360.com,116.31.112.38,2000-01-05 20:35:41\\n+241,Teresa,treynolds6o@miitbeian.gov.cn,198.126.205.220,1996-11-08 01:27:31\\n+242,Johnny,jmason6p@flickr.com,192.8.232.114,2013-05-14 05:35:50\\n+243,Angela,akelly6q@guardian.co.uk,234.116.60.197,1977-08-20 02:05:17\\n+244,Douglas,dcole6r@cmu.edu,128.135.212.69,2016-10-26 17:40:36\\n+245,Frances,fcampbell6s@twitpic.com,94.22.243.235,1987-04-26 07:07:13\\n+246,Donna,dgreen6t@chron.com,227.116.46.107,2011-07-25 12:59:54\\n+247,Benjamin,bfranklin6u@redcross.org,89.141.142.89,1974-05-03 20:28:18\\n+248,Randy,rpalmer6v@rambler.ru,70.173.63.178,2011-12-20 17:40:18\\n+249,Melissa,mmurray6w@bbb.org,114.234.118.137,1991-02-26 12:45:44\\n+250,Jean,jlittle6x@epa.gov,141.21.163.254,1991-08-16 04:57:09\\n+251,Daniel,dolson6y@nature.com,125.75.104.97,2010-04-23 06:25:54\\n+252,Kathryn,kwells6z@eventbrite.com,225.104.28.249,2015-01-31 02:21:50\\n+253,Theresa,tgonzalez70@ox.ac.uk,91.93.156.26,1971-12-11 10:31:31\\n+254,Beverly,broberts71@bluehost.com,244.40.158.89,2013-09-21 13:02:31\\n+255,Pamela,pmurray72@netscape.com,218.54.95.216,1985-04-16 00:34:00\\n+256,Timothy,trichardson73@amazonaws.com,235.49.24.229,2000-11-11 09:48:28\\n+257,Mildred,mpalmer74@is.gd,234.125.95.132,1992-05-25 02:25:02\\n+258,Jessica,jcampbell75@google.it,55.98.30.140,2014-08-26 00:26:34\\n+259,Beverly,bthomas76@cpanel.net,48.78.228.176,1970-08-18 10:40:05\\n+260,Eugene,eward77@cargocollective.com,139.226.204.2,1996-12-04 23:17:00\\n+261,Andrea,aallen78@webnode.com,160.31.214.38,2009-07-06 07:22:37\\n+262,Justin,jruiz79@merriam-webster.com,150.149.246.122,2005-06-06 11:44:19\\n+263,Kenneth,kedwards7a@networksolutions.com,98.82.193.128,2001-07-03 02:00:10\\n+264,Rachel,rday7b@miibeian.gov.cn,114.15.247.221,1994-08-18 19:45:40\\n+265,Russell,rmiller7c@instagram.com,184.130.152.253,1977-11-06 01:58:12\\n+266,Bonnie,bhudson7d@cornell.edu,235.180.186.206,1990-12-03 22:45:24\\n+267,Raymond,rknight7e@yandex.ru,161.2.44.252,1995-08-25 04:31:19\\n+268,Bonnie,brussell7f@elpais.com,199.237.57.207,1991-03-29 08:32:06\\n+269,Marie,mhenderson7g@elpais.com,52.203.131.144,2004-06-04 21:50:28\\n+270,Alan,acarr7h@trellian.com,147.51.205.72,2005-03-03 10:51:31\\n+271,Barbara,bturner7i@hugedomains.com,103.160.110.226,2004-08-04 13:42:40\\n+272,Christina,cdaniels7j@census.gov,0.238.61.251,1972-10-18 12:47:33\\n+273,Jeremy,jgomez7k@reuters.com,111.26.65.56,2013-01-13 10:41:35\\n+274,Laura,lwood7l@icio.us,149.153.38.205,2011-06-25 09:33:59\\n+275,Matthew,mbowman7m@auda.org.au,182.138.206.172,1999-03-05 03:25:36\\n+276,Denise,dparker7n@icq.com,0.213.88.138,2011-11-04 09:43:06\\n+277,Phillip,pparker7o@discuz.net,219.242.165.240,1973-10-19 04:22:29\\n+278,Joan,jpierce7p@salon.com,63.31.213.202,1989-04-09 22:06:24\\n+279,Irene,ibaker7q@cbc.ca,102.33.235.114,1992-09-04 13:00:57\\n+280,Betty,bbowman7r@ted.com,170.91.249.242,2015-09-28 08:14:22\\n+281,Teresa,truiz7s@boston.com,82.108.158.207,1999-07-18 05:17:09\\n+282,Helen,hbrooks7t@slideshare.net,102.87.162.187,2003-01-06 15:45:29\\n+283,Karen,kgriffin7u@wunderground.com,43.82.44.184,2010-05-28 01:56:37\\n+284,Lisa,lfernandez7v@mtv.com,200.238.218.220,1993-04-03 20:33:51\\n+285,Jesse,jlawrence7w@timesonline.co.uk,95.122.105.78,1990-01-05 17:28:43\\n+286,Terry,tross7x@macromedia.com,29.112.114.133,2009-08-29 21:32:17\\n+287,Angela,abradley7y@icq.com,177.44.27.72,1989-10-04 21:46:06\\n+288,Maria,mhart7z@dailymotion.com,55.27.55.202,1975-01-21 01:22:57\\n+289,Raymond,randrews80@pinterest.com,88.90.78.67,1992-03-16 21:37:40\\n+290,Kathy,krice81@bluehost.com,212.63.196.102,2000-12-14 03:06:44\\n+291,Cynthia,cramos82@nymag.com,107.89.190.6,2005-06-28 02:02:33\\n+292,Kimberly,kjones83@mysql.com,86.169.101.101,2007-06-13 22:56:49\\n+293,Timothy,thansen84@microsoft.com,108.100.254.90,2003-04-04 10:31:57\\n+294,Carol,cspencer85@berkeley.edu,75.118.144.187,1999-03-30 14:53:21\\n+295,Louis,lmedina86@latimes.com,141.147.163.24,1991-04-11 17:53:13\\n+296,Margaret,mcole87@google.fr,53.184.26.83,1991-12-19 01:54:10\\n+297,Mary,mgomez88@yellowpages.com,208.56.57.99,1976-05-21 18:05:08\\n+298,Amanda,aanderson89@geocities.com,147.73.15.252,1987-08-22 15:05:28\\n+299,Kathryn,kgarrett8a@nature.com,27.29.177.220,1976-07-15 04:25:04\\n+300,Dorothy,dmason8b@shareasale.com,106.210.99.193,1990-09-03 21:39:31\\n+301,Lois,lkennedy8c@amazon.de,194.169.29.187,2007-07-29 14:09:31\\n+302,Irene,iburton8d@washingtonpost.com,196.143.110.249,2013-09-05 11:32:46\\n+303,Betty,belliott8e@wired.com,183.105.222.199,1979-09-19 19:29:13\\n+304,Bobby,bmeyer8f@census.gov,36.13.161.145,2014-05-24 14:34:39\\n+305,Ann,amorrison8g@sfgate.com,72.154.54.137,1978-10-05 14:22:34\\n+306,Daniel,djackson8h@wunderground.com,144.95.32.34,1990-07-27 13:23:05\\n+307,Joe,jboyd8i@alibaba.com,187.105.86.178,2011-09-28 16:46:32\\n+308,Ralph,rdunn8j@fc2.com,3.19.87.255,1984-10-18 08:00:40\\n+309,Craig,ccarter8k@gizmodo.com,235.152.76.215,1998-07-04 12:15:21\\n+310,Paula,pdean8l@hhs.gov,161.100.173.197,1973-02-13 09:38:55\\n+311,Andrew,agarrett8m@behance.net,199.253.123.218,1991-02-14 13:36:32\\n+312,Janet,jhowell8n@alexa.com,39.189.139.79,2012-11-24 20:17:33\\n+313,Keith,khansen8o@godaddy.com,116.186.223.196,1987-08-23 21:22:05\\n+314,Nicholas,nedwards8p@state.gov,142.175.142.11,1977-03-28 18:27:27\\n+315,Jacqueline,jallen8q@oaic.gov.au,189.66.135.192,1994-10-26 11:44:26\\n+316,Frank,fgardner8r@mapy.cz,154.77.119.169,1983-01-29 19:19:51\\n+317,Eric,eharrison8s@google.cn,245.139.65.123,1984-02-04 09:54:36\\n+318,Gregory,gcooper8t@go.com,171.147.0.221,2004-06-14 05:22:08\\n+319,Jean,jfreeman8u@rakuten.co.jp,67.243.121.5,1977-01-07 18:23:43\\n+320,Juan,jlewis8v@shinystat.com,216.181.171.189,2001-08-23 17:32:43\\n+321,Randy,rwilliams8w@shinystat.com,105.152.146.28,1983-02-17 00:05:50\\n+322,Stephen,shart8x@sciencedirect.com,196.131.205.148,2004-02-15 10:12:03\\n+323,Annie,ahunter8y@example.com,63.36.34.103,2003-07-23 21:15:25\\n+324,Melissa,mflores8z@cbc.ca,151.230.217.90,1983-11-02 14:53:56\\n+325,Jane,jweaver90@about.me,0.167.235.217,1987-07-29 00:13:44\\n+326,Anthony,asmith91@oracle.com,97.87.48.41,2001-05-31 18:44:11\\n+327,Terry,tdavis92@buzzfeed.com,46.20.12.51,2015-09-12 23:13:55\\n+328,Brandon,bmontgomery93@gravatar.com,252.101.48.186,2010-10-28 08:26:27\\n+329,Chris,cmurray94@bluehost.com,25.158.167.97,2004-05-05 16:10:31\\n+330,Denise,dfuller95@hugedomains.com,216.210.149.28,1979-04-20 08:57:24\\n+331,Arthur,amcdonald96@sakura.ne.jp,206.42.36.213,2009-08-15 03:26:16\\n+332,Jesse,jhoward97@google.cn,46.181.118.30,1974-04-18 14:08:41\\n+333,Frank,fsimpson98@domainmarket.com,163.220.211.87,2006-06-30 14:46:52\\n+334,Janice,jwoods99@pen.io,229.245.237.182,1988-04-06 11:52:58\\n+335,Rebecca,rroberts9a@huffingtonpost.com,148.96.15.80,1976-10-05 08:44:16\\n+336,Joshua,jray9b@opensource.org,192.253.12.198,1971-12-25 22:27:07\\n+337,Joyce,jcarpenter9c@statcounter.com,125.171.46.215,2001-12-31 22:08:13\\n+338,Andrea,awest9d@privacy.gov.au,79.101.180.201,1983-02-18 20:07:47\\n+339,Christine,chudson9e@yelp.com,64.198.43.56,1997-09-08 08:03:43\\n+340,Joe,jparker9f@earthlink.net,251.215.148.153,1973-11-04 05:08:18\\n+341,Thomas,tkim9g@answers.com,49.187.34.47,1991-08-07 21:13:48\\n+342,Janice,jdean9h@scientificamerican.com,4.197.117.16,2009-12-08 02:35:49\\n+343,James,jmitchell9i@umich.edu,43.121.18.147,2011-04-28 17:04:09\\n+344,Charles,cgardner9j@purevolume.com,197.78.240.240,1998-02-11 06:47:07\\n+345,Robert,rhenderson9k@friendfeed.com,215.84.180.88,2002-05-10 15:33:14\\n+346,Chris,cgray9l@4shared.com,249.70.192.240,1998-10-03 16:43:42\\n+347,Gloria,ghayes9m@hibu.com,81.103.138.26,1999-12-26 11:23:13\\n+348,Edward,eramirez9n@shareasale.com,38.136.90.136,2010-08-19 08:01:06\\n+349,Cheryl,cbutler9o@google.ca,172.180.78.172,1995-05-27 20:03:52\\n+350,Margaret,mwatkins9p@sfgate.com,3.20.198.6,2014-10-21 01:42:58\\n+351,Rebecca,rwelch9q@examiner.com,45.81.42.208,2001-02-08 12:19:06\\n+352,Joe,jpalmer9r@phpbb.com,163.202.92.190,1970-01-05 11:29:12\\n+353,Sandra,slewis9s@dyndns.org,77.215.201.236,1974-01-05 07:04:04\\n+354,Todd,tfranklin9t@g.co,167.125.181.82,2009-09-28 10:13:58\\n+355,Joseph,jlewis9u@webmd.com,244.204.6.11,1990-10-21 15:49:57\\n+356,Alan,aknight9v@nydailynews.com,152.197.95.83,1996-03-08 08:43:17\\n+357,Sharon,sdean9w@123-reg.co.uk,237.46.40.26,1985-11-30 12:09:24\\n+358,Annie,awright9x@cafepress.com,190.45.231.111,2000-08-24 11:56:06\\n+359,Diane,dhamilton9y@youtube.com,85.146.171.196,2015-02-24 02:03:57\\n+360,Antonio,alane9z@auda.org.au,61.63.146.203,2001-05-13 03:43:34\\n+361,Matthew,mallena0@hhs.gov,29.97.32.19,1973-02-19 23:43:32\\n+362,Bonnie,bfowlera1@soup.io,251.216.99.53,2013-08-01 15:35:41\\n+363,Margaret,mgraya2@examiner.com,69.255.151.79,1998-01-23 22:24:59\\n+364,Joan,jwagnera3@printfriendly.com,192.166.120.61,1973-07-13 00:30:22\\n+365,Catherine,cperkinsa4@nytimes.com,58.21.24.214,2006-11-19 11:52:26\\n+366,Mark,mcartera5@cpanel.net,220.33.102.142,2007-09-09 09:43:27\\n+367,Paula,ppricea6@msn.com,36.182.238.124,2009-11-11 09:13:05\\n+368,Catherine,cgreena7@army.mil,228.203.58.19,2005-08-09 16:52:15\\n+369,Helen,hhamiltona8@symantec.com,155.56.194.99,2005-02-01 05:40:36\\n+370,Jane,jmeyera9@ezinearticles.com,133.244.113.213,2013-11-06 22:10:23\\n+371,Wanda,wevansaa@bloglovin.com,233.125.192.48,1994-12-26 23:43:42\\n+372,Mark,mmarshallab@tumblr.com,114.74.60.47,2016-09-29 18:03:01\\n+373,Andrew,amartinezac@google.cn,182.54.37.130,1976-06-06 17:04:17\\n+374,Helen,hmoralesad@e-recht24.de,42.45.4.123,1977-03-28 19:06:59\\n+375,Bonnie,bstoneae@php.net,196.149.79.137,1970-02-05 17:05:58\\n+376,Douglas,dfreemanaf@nasa.gov,215.65.124.218,2008-11-20 21:51:55\\n+377,Willie,wwestag@army.mil,35.189.92.118,1992-07-24 05:08:08\\n+378,Cheryl,cwagnerah@upenn.edu,228.239.222.141,2010-01-25 06:29:01\\n+379,Sandra,swardai@baidu.com,63.11.113.240,1985-05-23 08:07:37\\n+380,Julie,jrobinsonaj@jugem.jp,110.58.202.50,2015-03-05 09:42:07\\n+381,Larry,lwagnerak@shop-pro.jp,98.234.25.24,1975-07-22 22:22:02\\n+382,Juan,jcastilloal@yelp.com,24.174.74.202,2007-01-17 09:32:43\\n+383,Donna,dfrazieram@artisteer.com,205.26.147.45,1990-02-11 20:55:46\\n+384,Rachel,rfloresan@w3.org,109.60.216.162,1983-05-22 22:42:18\\n+385,Robert,rreynoldsao@theguardian.com,122.65.209.130,2009-05-01 18:02:51\\n+386,Donald,dbradleyap@etsy.com,42.54.35.126,1997-01-16 16:31:52\\n+387,Rachel,rfisheraq@nih.gov,160.243.250.45,2006-02-17 22:05:49\\n+388,Nicholas,nhamiltonar@princeton.edu,156.211.37.111,1976-06-21 03:36:29\\n+389,Timothy,twhiteas@ca.gov,36.128.23.70,1975-09-24 03:51:18\\n+390,Diana,dbradleyat@odnoklassniki.ru,44.102.120.184,1983-04-27 09:02:50\\n+391,Billy,bfowlerau@jimdo.com,91.200.68.196,1995-01-29 06:57:35\\n+392,Bruce,bandrewsav@ucoz.com,48.12.101.125,1992-10-27 04:31:39\\n+393,Linda,lromeroaw@usa.gov,100.71.233.19,1992-06-08 15:13:18\\n+394,Debra,dwatkinsax@ucoz.ru,52.160.233.193,2001-11-11 06:51:01\\n+395,Katherine,kburkeay@wix.com,151.156.242.141,2010-06-14 19:54:28\\n+396,Martha,mharrisonaz@youku.com,21.222.10.199,1989-10-16 14:17:55\\n+397,Dennis,dwellsb0@youtu.be,103.16.29.3,1985-12-21 06:05:51\\n+398,Gloria,grichardsb1@bloglines.com,90.147.120.234,1982-08-27 01:04:43\\n+399,Brenda,bfullerb2@t.co,33.253.63.90,2011-04-20 05:00:35\\n+400,Larry,lhendersonb3@disqus.com,88.95.132.128,1982-08-31 02:15:12\\n+401,Richard,rlarsonb4@wisc.edu,13.48.231.150,1979-04-15 14:08:09\\n+402,Terry,thuntb5@usa.gov,65.91.103.240,1998-05-15 11:50:49\\n+403,Harry,hburnsb6@nasa.gov,33.38.21.244,1981-04-12 14:02:20\\n+404,Diana,dellisb7@mlb.com,218.229.81.135,1997-01-29 00:17:25\\n+405,Jack,jburkeb8@tripadvisor.com,210.227.182.216,1984-03-09 17:24:03\\n+406,Julia,jlongb9@fotki.com,10.210.12.104,2005-10-26 03:54:13\\n+407,Lois,lscottba@msu.edu,188.79.136.138,1973-02-02 18:40:39\\n+408,Sandra,shendersonbb@shareasale.com,114.171.220.108,2012-06-09 18:22:26\\n+409,Irene,isanchezbc@cdbaby.com,109.255.50.119,1983-09-28 21:11:27\\n+410,Emily,ebrooksbd@bandcamp.com,227.81.93.79,1970-08-31 21:08:01\\n+411,Michelle,mdiazbe@businessweek.com,236.249.6.226,1993-05-22 08:07:07\\n+412,Tammy,tbennettbf@wisc.edu,145.253.239.152,1978-12-31 20:24:51\\n+413,Christine,cgreenebg@flickr.com,97.25.140.118,1978-07-17 12:55:30\\n+414,Patricia,pgarzabh@tuttocitta.it,139.246.192.211,1984-02-27 13:40:08\\n+415,Kimberly,kromerobi@aol.com,73.56.88.247,1976-09-16 14:22:04\\n+416,George,gjohnstonbj@fda.gov,240.36.245.185,1979-07-24 14:36:02\\n+417,Eugene,efullerbk@sciencedaily.com,42.38.105.140,2012-09-12 01:56:41\\n+418,Andrea,astevensbl@goo.gl,31.152.207.204,1979-05-24 11:06:21\\n+419,Shirley,sreidbm@scientificamerican.com,103.60.31.241,1984-02-23 04:07:41\\n+420,Terry,tmorenobn@blinklist.com,92.161.34.42,1994-06-25 14:01:35\\n+421,Christopher,cmorenobo@go.com,158.86.176.82,1973-09-05 09:18:47\\n+422,Dennis,dhansonbp@ning.com,40.160.81.75,1982-01-20 10:19:41\\n+423,Beverly,brussellbq@de.vu,138.32.56.204,1997-11-06 07:20:19\\n+424,Howard,hparkerbr@163.com,103.171.134.171,2015-06-24 15:37:10\\n+425,Helen,hmccoybs@fema.gov,61.200.4.71,1995-06-20 08:59:10\\n+426,Ann,ahudsonbt@cafepress.com,239.187.71.125,1977-04-11 07:59:28\\n+427,Tina,twestbu@nhs.uk,80.213.117.74,1992-08-19 05:54:44\\n+428,Terry,tnguyenbv@noaa.gov,21.93.118.95,1991-09-19 23:22:55\\n+429,Ashley,aburtonbw@wix.com,233.176.205.109,2009-11-10 05:01:20\\n+430,Eric,emyersbx@1und1.de,168.91.212.67,1987-08-10 07:16:20\\n+431,Barbara,blittleby@lycos.com,242.14.189.239,2008-08-02 12:13:04\\n+432,Sean,sevansbz@instagram.com,14.39.177.13,2007-04-16 17:28:49\\n+433,Shirley,sburtonc0@newsvine.com,34.107.138.76,1980-12-10 02:19:29\\n+434,Patricia,pfreemanc1@so-net.ne.jp,219.213.142.117,1987-03-01 02:25:45\\n+435,Paula,pfosterc2@vkontakte.ru,227.14.138.141,1972-09-22 12:59:34\\n+436,Nicole,nstewartc3@1688.com,8.164.23.115,1998-10-27 00:10:17\\n+437,Earl,ekimc4@ovh.net,100.26.244.177,2013-01-22 10:05:46\\n+438,Beverly,breedc5@reuters.com,174.12.226.27,1974-09-22 07:29:36\\n+439,Lawrence,lbutlerc6@a8.net,105.164.42.164,1992-06-05 00:43:40\\n+440,Charles,cmoorec7@ucoz.com,252.197.131.69,1990-04-09 02:34:05\\n+441,Alice,alawsonc8@live.com,183.73.220.232,1989-02-28 09:11:04\\n+442,Dorothy,dcarpenterc9@arstechnica.com,241.47.200.14,2005-05-02 19:57:21\\n+443,Carolyn,cfowlerca@go.com,213.109.55.202,1978-09-10 20:18:20\\n+444,Anthony,alongcb@free.fr,169.221.158.204,1984-09-13 01:59:23\\n+445,Annie,amoorecc@e-recht24.de,50.34.148.61,2009-03-26 03:41:07\\n+446,Carlos,candrewscd@ihg.com,236.69.59.212,1972-03-29 22:42:48\\n+447,Beverly,bramosce@google.ca,164.250.184.49,1982-11-10 04:34:01\\n+448,Teresa,tlongcf@umich.edu,174.88.53.223,1987-05-17 12:48:00\\n+449,Roy,rboydcg@uol.com.br,91.58.243.215,1974-06-16 17:59:54\\n+450,Ashley,afieldsch@tamu.edu,130.138.11.126,1983-09-15 05:52:36\\n+451,Judith,jhawkinsci@cmu.edu,200.187.103.245,2003-10-22 12:24:03\\n+452,Rebecca,rwestcj@ocn.ne.jp,72.85.3.103,1980-11-13 11:01:26\\n+453,Raymond,rporterck@infoseek.co.jp,146.33.216.151,1982-05-17 23:58:03\\n+454,Janet,jmarshallcl@odnoklassniki.ru,52.46.193.166,1998-10-04 00:02:21\\n+455,Shirley,speterscm@salon.com,248.126.31.15,1987-01-30 06:04:59\\n+456,Annie,abowmancn@economist.com,222.213.248.59,2006-03-14 23:52:59\\n+457,Jean,jlarsonco@blogspot.com,71.41.25.195,2007-09-08 23:49:45\\n+458,Phillip,pmoralescp@stanford.edu,74.119.87.28,2011-03-14 20:25:40\\n+459,Norma,nrobinsoncq@economist.com,28.225.21.54,1989-10-21 01:22:43\\n+460,Kimberly,kclarkcr@dion.ne.jp,149.171.132.153,2008-06-27 02:27:30\\n+461,Ruby,rmorriscs@ucla.edu,177.85.163.249,2016-01-28 16:43:44\\n+462,Jonathan,jcastilloct@tripod.com,78.4.28.77,2000-05-24 17:33:06\\n+463,Edward,ebryantcu@jigsy.com,140.31.98.193,1992-12-17 08:32:47\\n+464,Chris,chamiltoncv@eepurl.com,195.171.234.206,1970-12-05 03:42:19\\n+465,Michael,mweavercw@reference.com,7.233.133.213,1987-03-29 02:30:54\\n+466,Howard,hlawrencecx@businessweek.com,113.225.124.224,1990-07-30 07:20:57\\n+467,Philip,phowardcy@comsenz.com,159.170.247.249,2010-10-15 10:18:37\\n+468,Mary,mmarshallcz@xing.com,125.132.189.70,2007-07-19 13:48:47\\n+469,Scott,salvarezd0@theguardian.com,78.49.103.230,1987-10-31 06:10:44\\n+470,Wayne,wcarrolld1@blog.com,238.1.120.204,1980-11-19 03:26:10\\n+471,Jennifer,jwoodsd2@multiply.com,92.20.224.49,2010-05-06 22:17:04\\n+472,Raymond,rwelchd3@toplist.cz,176.158.35.240,2007-12-12 19:02:51\\n+473,Steven,sdixond4@wisc.edu,167.55.237.52,1984-05-05 11:44:37\\n+474,Ralph,rjamesd5@ameblo.jp,241.190.50.133,2000-07-06 08:44:37\\n+475,Jason,jrobinsond6@hexun.com,138.119.139.56,2006-02-03 05:27:45\\n+476,Doris,dwoodd7@fema.gov,180.220.156.190,1978-05-11 20:14:20\\n+477,Elizabeth,eberryd8@youtu.be,74.188.53.229,2006-11-18 08:29:06\\n+478,Irene,igilbertd9@privacy.gov.au,194.152.218.1,1985-09-17 02:46:52\\n+479,Jessica,jdeanda@ameblo.jp,178.103.93.118,1974-06-07 19:04:05\\n+480,Rachel,ralvarezdb@phoca.cz,17.22.223.174,1999-03-08 02:43:25\\n+481,Kenneth,kthompsondc@shinystat.com,229.119.91.234,2007-05-15 13:17:32\\n+482,Harold,hmurraydd@parallels.com,133.26.188.80,1993-11-15 03:42:07\\n+483,Paula,phowellde@samsung.com,34.215.28.216,1993-11-29 15:55:00\\n+484,Ruth,rpiercedf@tripadvisor.com,111.30.130.123,1986-08-17 10:19:38\\n+485,Phyllis,paustindg@vk.com,50.84.34.178,1994-04-13 03:05:24\\n+486,Laura,lfosterdh@usnews.com,37.8.101.33,2001-06-30 08:58:59\\n+487,Eric,etaylordi@com.com,103.183.253.45,2006-09-15 20:18:46\\n+488,Doris,driveradj@prweb.com,247.16.2.199,1989-05-08 09:27:09\\n+489,Ryan,rhughesdk@elegantthemes.com,103.234.153.232,1989-08-01 18:36:06\\n+490,Steve,smoralesdl@jigsy.com,3.76.84.207,2011-03-13 17:01:05\\n+491,Louis,lsullivandm@who.int,78.135.44.208,1975-11-26 16:01:23\\n+492,Catherine,ctuckerdn@seattletimes.com,93.137.106.21,1990-03-13 16:14:56\\n+493,Ann,adixondo@gmpg.org,191.136.222.111,2002-06-05 14:22:18\\n+494,Johnny,jhartdp@amazon.com,103.252.198.39,1988-07-30 23:54:49\\n+495,Susan,srichardsdq@skype.com,126.247.192.11,2005-01-09 12:08:14\\n+496,Brenda,bparkerdr@skype.com,63.232.216.86,1974-05-18 05:58:29\\n+497,Tammy,tmurphyds@constantcontact.com,56.56.37.112,2014-08-05 18:22:25\\n+498,Larry,lhayesdt@wordpress.com,162.146.13.46,1997-02-26 14:01:53\\n+499,,ethomasdu@hhs.gov,6.241.88.250,2007-09-14 13:03:34\\n+500,Paula,pshawdv@networksolutions.com,123.27.47.249,2003-10-30 21:19:20\\ndiff --git a/test/integration/005_simple_seed_test/test_simple_seed.py b/test/integration/005_simple_seed_test/test_simple_seed.py\\nindex 94f6fa86dc2..2d834e675e7 100644\\n--- a/test/integration/005_simple_seed_test/test_simple_seed.py\\n+++ b/test/integration/005_simple_seed_test/test_simple_seed.py\\n@@ -1,6 +1,11 @@\\n+import os\\n+\\n from test.integration.base import DBTIntegrationTest, use_profile\\n \\n from dbt.exceptions import CompilationException\\n+from dbt.compat import open_file\\n+\\n+\\n \\n class TestSimpleSeed(DBTIntegrationTest):\\n \\n@@ -162,5 +167,33 @@ def test_postgres_dbt_run_skips_seeds(self):\\n self.run_dbt(['seed'])\\n \\n \\n+class TestSimpleSeedWithBOM(DBTIntegrationTest):\\n+\\n+ def setUp(self):\\n+ DBTIntegrationTest.setUp(self)\\n+ self.run_sql_file(\\\"test/integration/005_simple_seed_test/seed.sql\\\")\\n \\n+ @property\\n+ def schema(self):\\n+ return \\\"simple_seed_005\\\"\\n \\n+ @property\\n+ def models(self):\\n+ return \\\"test/integration/005_simple_seed_test/models\\\"\\n+\\n+ @property\\n+ def project_config(self):\\n+ return {\\n+ \\\"data-paths\\\": ['test/integration/005_simple_seed_test/data-bom']\\n+ }\\n+\\n+ @use_profile('postgres')\\n+ def test_simple_seed(self):\\n+ # first make sure nobody \\\"fixed\\\" the file by accident\\n+ seed_path = os.path.join(self.config.data_paths[0], 'seed_bom.csv')\\n+ # 'test/integration/005_simple_seed_test/data-bom/seed_bom.csv'\\n+ with open_file(seed_path) as fp:\\n+ self.assertEqual(fp.read(1), u'\\\\ufeff')\\n+ results = self.run_dbt([\\\"seed\\\"])\\n+ self.assertEqual(len(results), 1)\\n+ self.assertTablesEqual(\\\"seed_bom\\\", \\\"seed_expected\\\")\\ndiff --git a/test/unit/test_agate_helper.py b/test/unit/test_agate_helper.py\\nindex ba8c4785cec..e39afcba009 100644\\n--- a/test/unit/test_agate_helper.py\\n+++ b/test/unit/test_agate_helper.py\\n@@ -13,6 +13,8 @@\\n 1,n,test,3.2,20180806T11:33:29.320Z,True,NULL\\n 2,y,asdf,900,20180806T11:35:29.320Z,False,a string\\\"\\\"\\\"\\n \\n+SAMPLE_CSV_BOM_DATA = u'\\\\ufeff' + SAMPLE_CSV_DATA\\n+\\n \\n EXPECTED = [\\n [1, 'n', 'test', Decimal('3.2'),\\n@@ -41,6 +43,15 @@ def test_from_csv(self):\\n for idx, row in enumerate(tbl):\\n self.assertEqual(list(row), EXPECTED[idx])\\n \\n+ def test_bom_from_csv(self):\\n+ path = os.path.join(self.tempdir, 'input.csv')\\n+ with open(path, 'wb') as fp:\\n+ fp.write(SAMPLE_CSV_BOM_DATA.encode('utf-8'))\\n+ tbl = agate_helper.from_csv(path)\\n+ self.assertEqual(len(tbl), len(EXPECTED))\\n+ for idx, row in enumerate(tbl):\\n+ self.assertEqual(list(row), EXPECTED[idx])\\n+\\n def test_from_data(self):\\n column_names = ['a', 'b', 'c', 'd', 'e', 'f', 'g']\\n data = [\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -41,4 +42,7 @@ def as_matrix(table):\n \n \n def from_csv(abspath):\n- return agate.Table.from_csv(abspath, column_types=DEFAULT_TYPE_TESTER)\n+ with dbt.compat.open_file(abspath) as fp:\n+ if fp.read(1) != u'\\ufeff':","line":null,"original_line":46,"original_start_line":null,"path":"core/dbt/clients/agate_helper.py","start_line":null,"text":"@user1:\ndid you try using `codecs.BOM_UTF8` instead of the hardcoded value here?\r\n\r\nhttps://docs.python.org/2/library/codecs.html#codecs.BOM_UTF8\r\nhttps://docs.python.org/3/library/codecs.html#codecs.BOM_UTF8\n\n@author:\nI'm explicitly opening the value as unicode (that's what `open_file` does), so examining the unicode code point rather than the byte sequence is correct.\n\n@user1:\nNot suggesting that your comparison is wrong, just that you could replace the magic value `u'\\ufeff'` with `codecs.BOM_UTF8.decode('utf-8')`"}],"string":"[\n {\n \"diff_hunk\": \"@@ -41,4 +42,7 @@ def as_matrix(table):\\n \\n \\n def from_csv(abspath):\\n- return agate.Table.from_csv(abspath, column_types=DEFAULT_TYPE_TESTER)\\n+ with dbt.compat.open_file(abspath) as fp:\\n+ if fp.read(1) != u'\\\\ufeff':\",\n \"line\": null,\n \"original_line\": 46,\n \"original_start_line\": null,\n \"path\": \"core/dbt/clients/agate_helper.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\ndid you try using `codecs.BOM_UTF8` instead of the hardcoded value here?\\r\\n\\r\\nhttps://docs.python.org/2/library/codecs.html#codecs.BOM_UTF8\\r\\nhttps://docs.python.org/3/library/codecs.html#codecs.BOM_UTF8\\n\\n@author:\\nI'm explicitly opening the value as unicode (that's what `open_file` does), so examining the unicode code point rather than the byte sequence is correct.\\n\\n@user1:\\nNot suggesting that your comparison is wrong, just that you could replace the magic value `u'\\\\ufeff'` with `codecs.BOM_UTF8.decode('utf-8')`\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"26427d2af025f51cab52086a85666fb24ba86744"},"merged_patch":{"kind":"string","value":"diff --git a/core/dbt/clients/agate_helper.py b/core/dbt/clients/agate_helper.py\nindex e08c500f485..446056a5e8f 100644\n--- a/core/dbt/clients/agate_helper.py\n+++ b/core/dbt/clients/agate_helper.py\n@@ -1,6 +1,11 @@\n+from codecs import BOM_UTF8\n+\n+import dbt.compat\n \n import agate\n \n+BOM = BOM_UTF8.decode('utf-8') # '\\ufeff'\n+\n DEFAULT_TYPE_TESTER = agate.TypeTester(types=[\n agate.data_types.Number(null_values=('null', '')),\n agate.data_types.TimeDelta(null_values=('null', '')),\n@@ -41,4 +46,7 @@ def as_matrix(table):\n \n \n def from_csv(abspath):\n- return agate.Table.from_csv(abspath, column_types=DEFAULT_TYPE_TESTER)\n+ with dbt.compat.open_file(abspath) as fp:\n+ if fp.read(1) != BOM:\n+ fp.seek(0)\n+ return agate.Table.from_csv(fp, column_types=DEFAULT_TYPE_TESTER)\ndiff --git a/core/dbt/compat.py b/core/dbt/compat.py\nindex 50f9c217914..b2533c6d8b9 100644\n--- a/core/dbt/compat.py\n+++ b/core/dbt/compat.py\n@@ -82,11 +82,20 @@ def to_native_string(s):\n \n def write_file(path, s):\n if WHICH_PYTHON == 2:\n- with codecs.open(path, 'w', encoding='utf-8') as f:\n- return f.write(to_string(s))\n+ open = codecs.open\n else:\n- with open(path, 'w') as f:\n- return f.write(to_string(s))\n+ open = builtins.open\n+ with open(path, 'w', encoding='utf-8') as f:\n+ return f.write(to_string(s))\n+\n+\n+def open_file(path):\n+ \"\"\"Open the path for reading. It must be utf-8 encoded.\"\"\"\n+ if WHICH_PYTHON == 2:\n+ open = codecs.open\n+ else:\n+ open = builtins.open\n+ return open(path, encoding='utf-8')\n \n \n if WHICH_PYTHON == 2:\ndiff --git a/test/integration/005_simple_seed_test/data-bom/seed_bom.csv b/test/integration/005_simple_seed_test/data-bom/seed_bom.csv\nnew file mode 100644\nindex 00000000000..1d37f5f2874\n--- /dev/null\n+++ b/test/integration/005_simple_seed_test/data-bom/seed_bom.csv\n@@ -0,0 +1,501 @@\n+id,first_name,email,ip_address,birthday\n+1,Larry,lking0@miitbeian.gov.cn,69.135.206.194,2008-09-12 19:08:31\n+2,Larry,lperkins1@toplist.cz,64.210.133.162,1978-05-09 04:15:14\n+3,Anna,amontgomery2@miitbeian.gov.cn,168.104.64.114,2011-10-16 04:07:57\n+4,Sandra,sgeorge3@livejournal.com,229.235.252.98,1973-07-19 10:52:43\n+5,Fred,fwoods4@google.cn,78.229.170.124,2012-09-30 16:38:29\n+6,Stephen,shanson5@livejournal.com,182.227.157.105,1995-11-07 21:40:50\n+7,William,wmartinez6@upenn.edu,135.139.249.50,1982-09-05 03:11:59\n+8,Jessica,jlong7@hao123.com,203.62.178.210,1991-10-16 11:03:15\n+9,Douglas,dwhite8@tamu.edu,178.187.247.1,1979-10-01 09:49:48\n+10,Lisa,lcoleman9@nydailynews.com,168.234.128.249,2011-05-26 07:45:49\n+11,Ralph,rfieldsa@home.pl,55.152.163.149,1972-11-18 19:06:11\n+12,Louise,lnicholsb@samsung.com,141.116.153.154,2014-11-25 20:56:14\n+13,Clarence,cduncanc@sfgate.com,81.171.31.133,2011-11-17 07:02:36\n+14,Daniel,dfranklind@omniture.com,8.204.211.37,1980-09-13 00:09:04\n+15,Katherine,klanee@auda.org.au,176.96.134.59,1997-08-22 19:36:56\n+16,Billy,bwardf@wikia.com,214.108.78.85,2003-10-19 02:14:47\n+17,Annie,agarzag@ocn.ne.jp,190.108.42.70,1988-10-28 15:12:35\n+18,Shirley,scolemanh@fastcompany.com,109.251.164.84,1988-08-24 10:50:57\n+19,Roger,rfrazieri@scribd.com,38.145.218.108,1985-12-31 15:17:15\n+20,Lillian,lstanleyj@goodreads.com,47.57.236.17,1970-06-08 02:09:05\n+21,Aaron,arodriguezk@nps.gov,205.245.118.221,1985-10-11 23:07:49\n+22,Patrick,pparkerl@techcrunch.com,19.8.100.182,2006-03-29 12:53:56\n+23,Phillip,pmorenom@intel.com,41.38.254.103,2011-11-07 15:35:43\n+24,Henry,hgarcian@newsvine.com,1.191.216.252,2008-08-28 08:30:44\n+25,Irene,iturnero@opera.com,50.17.60.190,1994-04-01 07:15:02\n+26,Andrew,adunnp@pen.io,123.52.253.176,2000-11-01 06:03:25\n+27,David,dgutierrezq@wp.com,238.23.203.42,1988-01-25 07:29:18\n+28,Henry,hsanchezr@cyberchimps.com,248.102.2.185,1983-01-01 13:36:37\n+29,Evelyn,epetersons@gizmodo.com,32.80.46.119,1979-07-16 17:24:12\n+30,Tammy,tmitchellt@purevolume.com,249.246.167.88,2001-04-03 10:00:23\n+31,Jacqueline,jlittleu@domainmarket.com,127.181.97.47,1986-02-11 21:35:50\n+32,Earl,eortizv@opera.com,166.47.248.240,1996-07-06 08:16:27\n+33,Juan,jgordonw@sciencedirect.com,71.77.2.200,1987-01-31 03:46:44\n+34,Diane,dhowellx@nyu.edu,140.94.133.12,1994-06-11 02:30:05\n+35,Randy,rkennedyy@microsoft.com,73.255.34.196,2005-05-26 20:28:39\n+36,Janice,jriveraz@time.com,22.214.227.32,1990-02-09 04:16:52\n+37,Laura,lperry10@diigo.com,159.148.145.73,2015-03-17 05:59:25\n+38,Gary,gray11@statcounter.com,40.193.124.56,1970-01-27 10:04:51\n+39,Jesse,jmcdonald12@typepad.com,31.7.86.103,2009-03-14 08:14:29\n+40,Sandra,sgonzalez13@goodreads.com,223.80.168.239,1993-05-21 14:08:54\n+41,Scott,smoore14@archive.org,38.238.46.83,1980-08-30 11:16:56\n+42,Phillip,pevans15@cisco.com,158.234.59.34,2011-12-15 23:26:31\n+43,Steven,sriley16@google.ca,90.247.57.68,2011-10-29 19:03:28\n+44,Deborah,dbrown17@hexun.com,179.125.143.240,1995-04-10 14:36:07\n+45,Lori,lross18@ow.ly,64.80.162.180,1980-12-27 16:49:15\n+46,Sean,sjackson19@tumblr.com,240.116.183.69,1988-06-12 21:24:45\n+47,Terry,tbarnes1a@163.com,118.38.213.137,1997-09-22 16:43:19\n+48,Dorothy,dross1b@ebay.com,116.81.76.49,2005-02-28 13:33:24\n+49,Samuel,swashington1c@house.gov,38.191.253.40,1989-01-19 21:15:48\n+50,Ralph,rcarter1d@tinyurl.com,104.84.60.174,2007-08-11 10:21:49\n+51,Wayne,whudson1e@princeton.edu,90.61.24.102,1983-07-03 16:58:12\n+52,Rose,rjames1f@plala.or.jp,240.83.81.10,1995-06-08 11:46:23\n+53,Louise,lcox1g@theglobeandmail.com,105.11.82.145,2016-09-19 14:45:51\n+54,Kenneth,kjohnson1h@independent.co.uk,139.5.45.94,1976-08-17 11:26:19\n+55,Donna,dbrown1i@amazon.co.uk,19.45.169.45,2006-05-27 16:51:40\n+56,Johnny,jvasquez1j@trellian.com,118.202.238.23,1975-11-17 08:42:32\n+57,Patrick,pramirez1k@tamu.edu,231.25.153.198,1997-08-06 11:51:09\n+58,Helen,hlarson1l@prweb.com,8.40.21.39,1993-08-04 19:53:40\n+59,Patricia,pspencer1m@gmpg.org,212.198.40.15,1977-08-03 16:37:27\n+60,Joseph,jspencer1n@marriott.com,13.15.63.238,2005-07-23 20:22:06\n+61,Phillip,pschmidt1o@blogtalkradio.com,177.98.201.190,1976-05-19 21:47:44\n+62,Joan,jwebb1p@google.ru,105.229.170.71,1972-09-07 17:53:47\n+63,Phyllis,pkennedy1q@imgur.com,35.145.8.244,2000-01-01 22:33:37\n+64,Katherine,khunter1r@smh.com.au,248.168.205.32,1991-01-09 06:40:24\n+65,Laura,lvasquez1s@wiley.com,128.129.115.152,1997-10-23 12:04:56\n+66,Juan,jdunn1t@state.gov,44.228.124.51,2004-11-10 05:07:35\n+67,Judith,jholmes1u@wiley.com,40.227.179.115,1977-08-02 17:01:45\n+68,Beverly,bbaker1v@wufoo.com,208.34.84.59,2016-03-06 20:07:23\n+69,Lawrence,lcarr1w@flickr.com,59.158.212.223,1988-09-13 06:07:21\n+70,Gloria,gwilliams1x@mtv.com,245.231.88.33,1995-03-18 22:32:46\n+71,Steven,ssims1y@cbslocal.com,104.50.58.255,2001-08-05 21:26:20\n+72,Betty,bmills1z@arstechnica.com,103.177.214.220,1981-12-14 21:26:54\n+73,Mildred,mfuller20@prnewswire.com,151.158.8.130,2000-04-19 10:13:55\n+74,Donald,dday21@icq.com,9.178.102.255,1972-12-03 00:58:24\n+75,Eric,ethomas22@addtoany.com,85.2.241.227,1992-11-01 05:59:30\n+76,Joyce,jarmstrong23@sitemeter.com,169.224.20.36,1985-10-24 06:50:01\n+77,Maria,mmartinez24@amazonaws.com,143.189.167.135,2005-10-05 05:17:42\n+78,Harry,hburton25@youtube.com,156.47.176.237,1978-03-26 05:53:33\n+79,Kevin,klawrence26@hao123.com,79.136.183.83,1994-10-12 04:38:52\n+80,David,dhall27@prweb.com,133.149.172.153,1976-12-15 16:24:24\n+81,Kathy,kperry28@twitter.com,229.242.72.228,1979-03-04 02:58:56\n+82,Adam,aprice29@elegantthemes.com,13.145.21.10,1982-11-07 11:46:59\n+83,Brandon,bgriffin2a@va.gov,73.249.128.212,2013-10-30 05:30:36\n+84,Henry,hnguyen2b@discovery.com,211.36.214.242,1985-01-09 06:37:27\n+85,Eric,esanchez2c@edublogs.org,191.166.188.251,2004-05-01 23:21:42\n+86,Jason,jlee2d@jimdo.com,193.92.16.182,1973-01-08 09:05:39\n+87,Diana,drichards2e@istockphoto.com,19.130.175.245,1994-10-05 22:50:49\n+88,Andrea,awelch2f@abc.net.au,94.155.233.96,2002-04-26 08:41:44\n+89,Louis,lwagner2g@miitbeian.gov.cn,26.217.34.111,2003-08-25 07:56:39\n+90,Jane,jsims2h@seesaa.net,43.4.220.135,1987-03-20 20:39:04\n+91,Larry,lgrant2i@si.edu,97.126.79.34,2000-09-07 20:26:19\n+92,Louis,ldean2j@prnewswire.com,37.148.40.127,2011-09-16 20:12:14\n+93,Jennifer,jcampbell2k@xing.com,38.106.254.142,1988-07-15 05:06:49\n+94,Wayne,wcunningham2l@google.com.hk,223.28.26.187,2009-12-15 06:16:54\n+95,Lori,lstevens2m@icq.com,181.250.181.58,1984-10-28 03:29:19\n+96,Judy,jsimpson2n@marriott.com,180.121.239.219,1986-02-07 15:18:10\n+97,Phillip,phoward2o@usa.gov,255.247.0.175,2002-12-26 08:44:45\n+98,Gloria,gwalker2p@usa.gov,156.140.7.128,1997-10-04 07:58:58\n+99,Paul,pjohnson2q@umn.edu,183.59.198.197,1991-11-14 12:33:55\n+100,Frank,fgreene2r@blogspot.com,150.143.68.121,2010-06-12 23:55:39\n+101,Deborah,dknight2s@reverbnation.com,222.131.211.191,1970-07-08 08:54:23\n+102,Sandra,sblack2t@tripadvisor.com,254.183.128.254,2000-04-12 02:39:36\n+103,Edward,eburns2u@dailymotion.com,253.89.118.18,1993-10-10 10:54:01\n+104,Anthony,ayoung2v@ustream.tv,118.4.193.176,1978-08-26 17:07:29\n+105,Donald,dlawrence2w@wp.com,139.200.159.227,2007-07-21 20:56:20\n+106,Matthew,mfreeman2x@google.fr,205.26.239.92,2014-12-05 17:05:39\n+107,Sean,ssanders2y@trellian.com,143.89.82.108,1993-07-14 21:45:02\n+108,Sharon,srobinson2z@soundcloud.com,66.234.247.54,1977-04-06 19:07:03\n+109,Jennifer,jwatson30@t-online.de,196.102.127.7,1998-03-07 05:12:23\n+110,Clarence,cbrooks31@si.edu,218.93.234.73,2002-11-06 17:22:25\n+111,Jose,jflores32@goo.gl,185.105.244.231,1995-01-05 06:32:21\n+112,George,glee33@adobe.com,173.82.249.196,2015-01-04 02:47:46\n+113,Larry,lhill34@linkedin.com,66.5.206.195,2010-11-02 10:21:17\n+114,Marie,mmeyer35@mysql.com,151.152.88.107,1990-05-22 20:52:51\n+115,Clarence,cwebb36@skype.com,130.198.55.217,1972-10-27 07:38:54\n+116,Sarah,scarter37@answers.com,80.89.18.153,1971-08-24 19:29:30\n+117,Henry,hhughes38@webeden.co.uk,152.60.114.174,1973-01-27 09:00:42\n+118,Teresa,thenry39@hao123.com,32.187.239.106,2015-11-06 01:48:44\n+119,Billy,bgutierrez3a@sun.com,52.37.70.134,2002-03-19 03:20:19\n+120,Anthony,agibson3b@github.io,154.251.232.213,1991-04-19 01:08:15\n+121,Sandra,sromero3c@wikia.com,44.124.171.2,1998-09-06 20:30:34\n+122,Paula,pandrews3d@blogs.com,153.142.118.226,2003-06-24 16:31:24\n+123,Terry,tbaker3e@csmonitor.com,99.120.45.219,1970-12-09 23:57:21\n+124,Lois,lwilson3f@reuters.com,147.44.171.83,1971-01-09 22:28:51\n+125,Sara,smorgan3g@nature.com,197.67.192.230,1992-01-28 20:33:24\n+126,Charles,ctorres3h@china.com.cn,156.115.216.2,1993-10-02 19:36:34\n+127,Richard,ralexander3i@marriott.com,248.235.180.59,1999-02-03 18:40:55\n+128,Christina,charper3j@cocolog-nifty.com,152.114.116.129,1978-09-13 00:37:32\n+129,Steve,sadams3k@economist.com,112.248.91.98,2004-03-21 09:07:43\n+130,Katherine,krobertson3l@ow.ly,37.220.107.28,1977-03-18 19:28:50\n+131,Donna,dgibson3m@state.gov,222.218.76.221,1999-02-01 06:46:16\n+132,Christina,cwest3n@mlb.com,152.114.6.160,1979-12-24 15:30:35\n+133,Sandra,swillis3o@meetup.com,180.71.49.34,1984-09-27 08:05:54\n+134,Clarence,cedwards3p@smugmug.com,10.64.180.186,1979-04-16 16:52:10\n+135,Ruby,rjames3q@wp.com,98.61.54.20,2007-01-13 14:25:52\n+136,Sarah,smontgomery3r@tripod.com,91.45.164.172,2009-07-25 04:34:30\n+137,Sarah,soliver3s@eventbrite.com,30.106.39.146,2012-05-09 22:12:33\n+138,Deborah,dwheeler3t@biblegateway.com,59.105.213.173,1999-11-09 08:08:44\n+139,Deborah,dray3u@i2i.jp,11.108.186.217,2014-02-04 03:15:19\n+140,Paul,parmstrong3v@alexa.com,6.250.59.43,2009-12-21 10:08:53\n+141,Aaron,abishop3w@opera.com,207.145.249.62,1996-04-25 23:20:23\n+142,Henry,hsanders3x@google.ru,140.215.203.171,2012-01-29 11:52:32\n+143,Anne,aanderson3y@1688.com,74.150.102.118,1982-04-03 13:46:17\n+144,Victor,vmurphy3z@hugedomains.com,222.155.99.152,1987-11-03 19:58:41\n+145,Evelyn,ereid40@pbs.org,249.122.33.117,1977-12-14 17:09:57\n+146,Brian,bgonzalez41@wikia.com,246.254.235.141,1991-02-24 00:45:58\n+147,Sandra,sgray42@squarespace.com,150.73.28.159,1972-07-28 17:26:32\n+148,Alice,ajones43@a8.net,78.253.12.177,2002-12-05 16:57:46\n+149,Jessica,jhanson44@mapquest.com,87.229.30.160,1994-01-30 11:40:04\n+150,Louise,lbailey45@reuters.com,191.219.31.101,2011-09-07 21:11:45\n+151,Christopher,cgonzalez46@printfriendly.com,83.137.213.239,1984-10-24 14:58:04\n+152,Gregory,gcollins47@yandex.ru,28.176.10.115,1998-07-25 17:17:10\n+153,Jane,jperkins48@usnews.com,46.53.164.159,1979-08-19 15:25:00\n+154,Phyllis,plong49@yahoo.co.jp,208.140.88.2,1985-07-06 02:16:36\n+155,Adam,acarter4a@scribd.com,78.48.148.204,2005-07-20 03:31:09\n+156,Frank,fweaver4b@angelfire.com,199.180.255.224,2011-03-04 23:07:54\n+157,Ronald,rmurphy4c@cloudflare.com,73.42.97.231,1991-01-11 10:39:41\n+158,Richard,rmorris4d@e-recht24.de,91.9.97.223,2009-01-17 21:05:15\n+159,Rose,rfoster4e@woothemes.com,203.169.53.16,1991-04-21 02:09:38\n+160,George,ggarrett4f@uiuc.edu,186.61.5.167,1989-11-11 11:29:42\n+161,Victor,vhamilton4g@biblegateway.com,121.229.138.38,2012-06-22 18:01:23\n+162,Mark,mbennett4h@businessinsider.com,209.184.29.203,1980-04-16 15:26:34\n+163,Martin,mwells4i@ifeng.com,97.223.55.105,2010-05-26 14:08:18\n+164,Diana,dstone4j@google.ru,90.155.52.47,2013-02-11 00:14:54\n+165,Walter,wferguson4k@blogger.com,30.63.212.44,1986-02-20 17:46:46\n+166,Denise,dcoleman4l@vistaprint.com,10.209.153.77,1992-05-13 20:14:14\n+167,Philip,pknight4m@xing.com,15.28.135.167,2000-09-11 18:41:13\n+168,Russell,rcarr4n@youtube.com,113.55.165.50,2008-07-10 17:49:27\n+169,Donna,dburke4o@dion.ne.jp,70.0.105.111,1992-02-10 17:24:58\n+170,Anne,along4p@squidoo.com,36.154.58.107,2012-08-19 23:35:31\n+171,Clarence,cbanks4q@webeden.co.uk,94.57.53.114,1972-03-11 21:46:44\n+172,Betty,bbowman4r@cyberchimps.com,178.115.209.69,2013-01-13 21:34:51\n+173,Andrew,ahudson4s@nytimes.com,84.32.252.144,1998-09-15 14:20:04\n+174,Keith,kgordon4t@cam.ac.uk,189.237.211.102,2009-01-22 05:34:38\n+175,Patrick,pwheeler4u@mysql.com,47.22.117.226,1984-09-05 22:33:15\n+176,Jesse,jfoster4v@mapquest.com,229.95.131.46,1990-01-20 12:19:15\n+177,Arthur,afisher4w@jugem.jp,107.255.244.98,1983-10-13 11:08:46\n+178,Nicole,nryan4x@wsj.com,243.211.33.221,1974-05-30 23:19:14\n+179,Bruce,bjohnson4y@sfgate.com,17.41.200.101,1992-09-23 02:02:19\n+180,Terry,tcox4z@reference.com,20.189.120.106,1982-02-13 12:43:14\n+181,Ashley,astanley50@kickstarter.com,86.3.56.98,1976-05-09 01:27:16\n+182,Michael,mrivera51@about.me,72.118.249.0,1971-11-11 17:28:37\n+183,Steven,sgonzalez52@mozilla.org,169.112.247.47,2002-08-24 14:59:25\n+184,Kathleen,kfuller53@bloglovin.com,80.93.59.30,2002-03-11 13:41:29\n+185,Nicole,nhenderson54@usda.gov,39.253.60.30,1995-04-24 05:55:07\n+186,Ralph,rharper55@purevolume.com,167.147.142.189,1980-02-10 18:35:45\n+187,Heather,hcunningham56@photobucket.com,96.222.196.229,2007-06-15 05:37:50\n+188,Nancy,nlittle57@cbc.ca,241.53.255.175,2007-07-12 23:42:48\n+189,Juan,jramirez58@pinterest.com,190.128.84.27,1978-11-07 23:37:37\n+190,Beverly,bfowler59@chronoengine.com,54.144.230.49,1979-03-31 23:27:28\n+191,Shirley,sstevens5a@prlog.org,200.97.231.248,2011-12-06 07:08:50\n+192,Annie,areyes5b@squidoo.com,223.32.182.101,2011-05-28 02:42:09\n+193,Jack,jkelley5c@tiny.cc,47.34.118.150,1981-12-05 17:31:40\n+194,Keith,krobinson5d@1und1.de,170.210.209.31,1999-03-09 11:05:43\n+195,Joseph,jmiller5e@google.com.au,136.74.212.139,1984-10-08 13:18:20\n+196,Annie,aday5f@blogspot.com,71.99.186.69,1986-02-18 12:27:34\n+197,Nancy,nperez5g@liveinternet.ru,28.160.6.107,1983-10-20 17:51:20\n+198,Tammy,tward5h@ucoz.ru,141.43.164.70,1980-03-31 04:45:29\n+199,Doris,dryan5i@ted.com,239.117.202.188,1985-07-03 03:17:53\n+200,Rose,rmendoza5j@photobucket.com,150.200.206.79,1973-04-21 21:36:40\n+201,Cynthia,cbutler5k@hubpages.com,80.153.174.161,2001-01-20 01:42:26\n+202,Samuel,soliver5l@people.com.cn,86.127.246.140,1970-09-02 02:19:00\n+203,Carl,csanchez5m@mysql.com,50.149.237.107,1993-12-01 07:02:09\n+204,Kathryn,kowens5n@geocities.jp,145.166.205.201,2004-07-06 18:39:33\n+205,Nicholas,nnichols5o@parallels.com,190.240.66.170,2014-11-11 18:52:19\n+206,Keith,kwillis5p@youtube.com,181.43.206.100,1998-06-13 06:30:51\n+207,Justin,jwebb5q@intel.com,211.54.245.74,2000-11-04 16:58:26\n+208,Gary,ghicks5r@wikipedia.org,196.154.213.104,1992-12-01 19:48:28\n+209,Martin,mpowell5s@flickr.com,153.67.12.241,1983-06-30 06:24:32\n+210,Brenda,bkelley5t@xinhuanet.com,113.100.5.172,2005-01-08 20:50:22\n+211,Edward,eray5u@a8.net,205.187.246.65,2011-09-26 08:04:44\n+212,Steven,slawson5v@senate.gov,238.150.250.36,1978-11-22 02:48:09\n+213,Robert,rthompson5w@furl.net,70.7.89.236,2001-09-12 08:52:07\n+214,Jack,jporter5x@diigo.com,220.172.29.99,1976-07-26 14:29:21\n+215,Lisa,ljenkins5y@oakley.com,150.151.170.180,2010-03-20 19:21:16\n+216,Theresa,tbell5z@mayoclinic.com,247.25.53.173,2001-03-11 05:36:40\n+217,Jimmy,jstephens60@weather.com,145.101.93.235,1983-04-12 09:35:30\n+218,Louis,lhunt61@amazon.co.jp,78.137.6.253,1997-08-29 19:34:34\n+219,Lawrence,lgilbert62@ted.com,243.132.8.78,2015-04-08 22:06:56\n+220,David,dgardner63@4shared.com,204.40.46.136,1971-07-09 03:29:11\n+221,Charles,ckennedy64@gmpg.org,211.83.233.2,2011-02-26 11:55:04\n+222,Lillian,lbanks65@msu.edu,124.233.12.80,2010-05-16 20:29:02\n+223,Ernest,enguyen66@baidu.com,82.45.128.148,1996-07-04 10:07:04\n+224,Ryan,rrussell67@cloudflare.com,202.53.240.223,1983-08-05 12:36:29\n+225,Donald,ddavis68@ustream.tv,47.39.218.137,1989-05-27 02:30:56\n+226,Joe,jscott69@blogspot.com,140.23.131.75,1973-03-16 12:21:31\n+227,Anne,amarshall6a@google.ca,113.162.200.197,1988-12-09 03:38:29\n+228,Willie,wturner6b@constantcontact.com,85.83.182.249,1991-10-06 01:51:10\n+229,Nicole,nwilson6c@sogou.com,30.223.51.135,1977-05-29 19:54:56\n+230,Janet,jwheeler6d@stumbleupon.com,153.194.27.144,2011-03-13 12:48:47\n+231,Lois,lcarr6e@statcounter.com,0.41.36.53,1993-02-06 04:52:01\n+232,Shirley,scruz6f@tmall.com,37.156.39.223,2007-02-18 17:47:01\n+233,Patrick,pford6g@reverbnation.com,36.198.200.89,1977-03-06 15:47:24\n+234,Lisa,lhudson6h@usatoday.com,134.213.58.137,2014-10-28 01:56:56\n+235,Pamela,pmartinez6i@opensource.org,5.151.127.202,1987-11-30 16:44:47\n+236,Larry,lperez6j@infoseek.co.jp,235.122.96.148,1979-01-18 06:33:45\n+237,Pamela,pramirez6k@census.gov,138.233.34.163,2012-01-29 10:35:20\n+238,Daniel,dcarr6l@php.net,146.21.152.242,1984-11-17 08:22:59\n+239,Patrick,psmith6m@indiegogo.com,136.222.199.36,2001-05-30 22:16:44\n+240,Raymond,rhenderson6n@hc360.com,116.31.112.38,2000-01-05 20:35:41\n+241,Teresa,treynolds6o@miitbeian.gov.cn,198.126.205.220,1996-11-08 01:27:31\n+242,Johnny,jmason6p@flickr.com,192.8.232.114,2013-05-14 05:35:50\n+243,Angela,akelly6q@guardian.co.uk,234.116.60.197,1977-08-20 02:05:17\n+244,Douglas,dcole6r@cmu.edu,128.135.212.69,2016-10-26 17:40:36\n+245,Frances,fcampbell6s@twitpic.com,94.22.243.235,1987-04-26 07:07:13\n+246,Donna,dgreen6t@chron.com,227.116.46.107,2011-07-25 12:59:54\n+247,Benjamin,bfranklin6u@redcross.org,89.141.142.89,1974-05-03 20:28:18\n+248,Randy,rpalmer6v@rambler.ru,70.173.63.178,2011-12-20 17:40:18\n+249,Melissa,mmurray6w@bbb.org,114.234.118.137,1991-02-26 12:45:44\n+250,Jean,jlittle6x@epa.gov,141.21.163.254,1991-08-16 04:57:09\n+251,Daniel,dolson6y@nature.com,125.75.104.97,2010-04-23 06:25:54\n+252,Kathryn,kwells6z@eventbrite.com,225.104.28.249,2015-01-31 02:21:50\n+253,Theresa,tgonzalez70@ox.ac.uk,91.93.156.26,1971-12-11 10:31:31\n+254,Beverly,broberts71@bluehost.com,244.40.158.89,2013-09-21 13:02:31\n+255,Pamela,pmurray72@netscape.com,218.54.95.216,1985-04-16 00:34:00\n+256,Timothy,trichardson73@amazonaws.com,235.49.24.229,2000-11-11 09:48:28\n+257,Mildred,mpalmer74@is.gd,234.125.95.132,1992-05-25 02:25:02\n+258,Jessica,jcampbell75@google.it,55.98.30.140,2014-08-26 00:26:34\n+259,Beverly,bthomas76@cpanel.net,48.78.228.176,1970-08-18 10:40:05\n+260,Eugene,eward77@cargocollective.com,139.226.204.2,1996-12-04 23:17:00\n+261,Andrea,aallen78@webnode.com,160.31.214.38,2009-07-06 07:22:37\n+262,Justin,jruiz79@merriam-webster.com,150.149.246.122,2005-06-06 11:44:19\n+263,Kenneth,kedwards7a@networksolutions.com,98.82.193.128,2001-07-03 02:00:10\n+264,Rachel,rday7b@miibeian.gov.cn,114.15.247.221,1994-08-18 19:45:40\n+265,Russell,rmiller7c@instagram.com,184.130.152.253,1977-11-06 01:58:12\n+266,Bonnie,bhudson7d@cornell.edu,235.180.186.206,1990-12-03 22:45:24\n+267,Raymond,rknight7e@yandex.ru,161.2.44.252,1995-08-25 04:31:19\n+268,Bonnie,brussell7f@elpais.com,199.237.57.207,1991-03-29 08:32:06\n+269,Marie,mhenderson7g@elpais.com,52.203.131.144,2004-06-04 21:50:28\n+270,Alan,acarr7h@trellian.com,147.51.205.72,2005-03-03 10:51:31\n+271,Barbara,bturner7i@hugedomains.com,103.160.110.226,2004-08-04 13:42:40\n+272,Christina,cdaniels7j@census.gov,0.238.61.251,1972-10-18 12:47:33\n+273,Jeremy,jgomez7k@reuters.com,111.26.65.56,2013-01-13 10:41:35\n+274,Laura,lwood7l@icio.us,149.153.38.205,2011-06-25 09:33:59\n+275,Matthew,mbowman7m@auda.org.au,182.138.206.172,1999-03-05 03:25:36\n+276,Denise,dparker7n@icq.com,0.213.88.138,2011-11-04 09:43:06\n+277,Phillip,pparker7o@discuz.net,219.242.165.240,1973-10-19 04:22:29\n+278,Joan,jpierce7p@salon.com,63.31.213.202,1989-04-09 22:06:24\n+279,Irene,ibaker7q@cbc.ca,102.33.235.114,1992-09-04 13:00:57\n+280,Betty,bbowman7r@ted.com,170.91.249.242,2015-09-28 08:14:22\n+281,Teresa,truiz7s@boston.com,82.108.158.207,1999-07-18 05:17:09\n+282,Helen,hbrooks7t@slideshare.net,102.87.162.187,2003-01-06 15:45:29\n+283,Karen,kgriffin7u@wunderground.com,43.82.44.184,2010-05-28 01:56:37\n+284,Lisa,lfernandez7v@mtv.com,200.238.218.220,1993-04-03 20:33:51\n+285,Jesse,jlawrence7w@timesonline.co.uk,95.122.105.78,1990-01-05 17:28:43\n+286,Terry,tross7x@macromedia.com,29.112.114.133,2009-08-29 21:32:17\n+287,Angela,abradley7y@icq.com,177.44.27.72,1989-10-04 21:46:06\n+288,Maria,mhart7z@dailymotion.com,55.27.55.202,1975-01-21 01:22:57\n+289,Raymond,randrews80@pinterest.com,88.90.78.67,1992-03-16 21:37:40\n+290,Kathy,krice81@bluehost.com,212.63.196.102,2000-12-14 03:06:44\n+291,Cynthia,cramos82@nymag.com,107.89.190.6,2005-06-28 02:02:33\n+292,Kimberly,kjones83@mysql.com,86.169.101.101,2007-06-13 22:56:49\n+293,Timothy,thansen84@microsoft.com,108.100.254.90,2003-04-04 10:31:57\n+294,Carol,cspencer85@berkeley.edu,75.118.144.187,1999-03-30 14:53:21\n+295,Louis,lmedina86@latimes.com,141.147.163.24,1991-04-11 17:53:13\n+296,Margaret,mcole87@google.fr,53.184.26.83,1991-12-19 01:54:10\n+297,Mary,mgomez88@yellowpages.com,208.56.57.99,1976-05-21 18:05:08\n+298,Amanda,aanderson89@geocities.com,147.73.15.252,1987-08-22 15:05:28\n+299,Kathryn,kgarrett8a@nature.com,27.29.177.220,1976-07-15 04:25:04\n+300,Dorothy,dmason8b@shareasale.com,106.210.99.193,1990-09-03 21:39:31\n+301,Lois,lkennedy8c@amazon.de,194.169.29.187,2007-07-29 14:09:31\n+302,Irene,iburton8d@washingtonpost.com,196.143.110.249,2013-09-05 11:32:46\n+303,Betty,belliott8e@wired.com,183.105.222.199,1979-09-19 19:29:13\n+304,Bobby,bmeyer8f@census.gov,36.13.161.145,2014-05-24 14:34:39\n+305,Ann,amorrison8g@sfgate.com,72.154.54.137,1978-10-05 14:22:34\n+306,Daniel,djackson8h@wunderground.com,144.95.32.34,1990-07-27 13:23:05\n+307,Joe,jboyd8i@alibaba.com,187.105.86.178,2011-09-28 16:46:32\n+308,Ralph,rdunn8j@fc2.com,3.19.87.255,1984-10-18 08:00:40\n+309,Craig,ccarter8k@gizmodo.com,235.152.76.215,1998-07-04 12:15:21\n+310,Paula,pdean8l@hhs.gov,161.100.173.197,1973-02-13 09:38:55\n+311,Andrew,agarrett8m@behance.net,199.253.123.218,1991-02-14 13:36:32\n+312,Janet,jhowell8n@alexa.com,39.189.139.79,2012-11-24 20:17:33\n+313,Keith,khansen8o@godaddy.com,116.186.223.196,1987-08-23 21:22:05\n+314,Nicholas,nedwards8p@state.gov,142.175.142.11,1977-03-28 18:27:27\n+315,Jacqueline,jallen8q@oaic.gov.au,189.66.135.192,1994-10-26 11:44:26\n+316,Frank,fgardner8r@mapy.cz,154.77.119.169,1983-01-29 19:19:51\n+317,Eric,eharrison8s@google.cn,245.139.65.123,1984-02-04 09:54:36\n+318,Gregory,gcooper8t@go.com,171.147.0.221,2004-06-14 05:22:08\n+319,Jean,jfreeman8u@rakuten.co.jp,67.243.121.5,1977-01-07 18:23:43\n+320,Juan,jlewis8v@shinystat.com,216.181.171.189,2001-08-23 17:32:43\n+321,Randy,rwilliams8w@shinystat.com,105.152.146.28,1983-02-17 00:05:50\n+322,Stephen,shart8x@sciencedirect.com,196.131.205.148,2004-02-15 10:12:03\n+323,Annie,ahunter8y@example.com,63.36.34.103,2003-07-23 21:15:25\n+324,Melissa,mflores8z@cbc.ca,151.230.217.90,1983-11-02 14:53:56\n+325,Jane,jweaver90@about.me,0.167.235.217,1987-07-29 00:13:44\n+326,Anthony,asmith91@oracle.com,97.87.48.41,2001-05-31 18:44:11\n+327,Terry,tdavis92@buzzfeed.com,46.20.12.51,2015-09-12 23:13:55\n+328,Brandon,bmontgomery93@gravatar.com,252.101.48.186,2010-10-28 08:26:27\n+329,Chris,cmurray94@bluehost.com,25.158.167.97,2004-05-05 16:10:31\n+330,Denise,dfuller95@hugedomains.com,216.210.149.28,1979-04-20 08:57:24\n+331,Arthur,amcdonald96@sakura.ne.jp,206.42.36.213,2009-08-15 03:26:16\n+332,Jesse,jhoward97@google.cn,46.181.118.30,1974-04-18 14:08:41\n+333,Frank,fsimpson98@domainmarket.com,163.220.211.87,2006-06-30 14:46:52\n+334,Janice,jwoods99@pen.io,229.245.237.182,1988-04-06 11:52:58\n+335,Rebecca,rroberts9a@huffingtonpost.com,148.96.15.80,1976-10-05 08:44:16\n+336,Joshua,jray9b@opensource.org,192.253.12.198,1971-12-25 22:27:07\n+337,Joyce,jcarpenter9c@statcounter.com,125.171.46.215,2001-12-31 22:08:13\n+338,Andrea,awest9d@privacy.gov.au,79.101.180.201,1983-02-18 20:07:47\n+339,Christine,chudson9e@yelp.com,64.198.43.56,1997-09-08 08:03:43\n+340,Joe,jparker9f@earthlink.net,251.215.148.153,1973-11-04 05:08:18\n+341,Thomas,tkim9g@answers.com,49.187.34.47,1991-08-07 21:13:48\n+342,Janice,jdean9h@scientificamerican.com,4.197.117.16,2009-12-08 02:35:49\n+343,James,jmitchell9i@umich.edu,43.121.18.147,2011-04-28 17:04:09\n+344,Charles,cgardner9j@purevolume.com,197.78.240.240,1998-02-11 06:47:07\n+345,Robert,rhenderson9k@friendfeed.com,215.84.180.88,2002-05-10 15:33:14\n+346,Chris,cgray9l@4shared.com,249.70.192.240,1998-10-03 16:43:42\n+347,Gloria,ghayes9m@hibu.com,81.103.138.26,1999-12-26 11:23:13\n+348,Edward,eramirez9n@shareasale.com,38.136.90.136,2010-08-19 08:01:06\n+349,Cheryl,cbutler9o@google.ca,172.180.78.172,1995-05-27 20:03:52\n+350,Margaret,mwatkins9p@sfgate.com,3.20.198.6,2014-10-21 01:42:58\n+351,Rebecca,rwelch9q@examiner.com,45.81.42.208,2001-02-08 12:19:06\n+352,Joe,jpalmer9r@phpbb.com,163.202.92.190,1970-01-05 11:29:12\n+353,Sandra,slewis9s@dyndns.org,77.215.201.236,1974-01-05 07:04:04\n+354,Todd,tfranklin9t@g.co,167.125.181.82,2009-09-28 10:13:58\n+355,Joseph,jlewis9u@webmd.com,244.204.6.11,1990-10-21 15:49:57\n+356,Alan,aknight9v@nydailynews.com,152.197.95.83,1996-03-08 08:43:17\n+357,Sharon,sdean9w@123-reg.co.uk,237.46.40.26,1985-11-30 12:09:24\n+358,Annie,awright9x@cafepress.com,190.45.231.111,2000-08-24 11:56:06\n+359,Diane,dhamilton9y@youtube.com,85.146.171.196,2015-02-24 02:03:57\n+360,Antonio,alane9z@auda.org.au,61.63.146.203,2001-05-13 03:43:34\n+361,Matthew,mallena0@hhs.gov,29.97.32.19,1973-02-19 23:43:32\n+362,Bonnie,bfowlera1@soup.io,251.216.99.53,2013-08-01 15:35:41\n+363,Margaret,mgraya2@examiner.com,69.255.151.79,1998-01-23 22:24:59\n+364,Joan,jwagnera3@printfriendly.com,192.166.120.61,1973-07-13 00:30:22\n+365,Catherine,cperkinsa4@nytimes.com,58.21.24.214,2006-11-19 11:52:26\n+366,Mark,mcartera5@cpanel.net,220.33.102.142,2007-09-09 09:43:27\n+367,Paula,ppricea6@msn.com,36.182.238.124,2009-11-11 09:13:05\n+368,Catherine,cgreena7@army.mil,228.203.58.19,2005-08-09 16:52:15\n+369,Helen,hhamiltona8@symantec.com,155.56.194.99,2005-02-01 05:40:36\n+370,Jane,jmeyera9@ezinearticles.com,133.244.113.213,2013-11-06 22:10:23\n+371,Wanda,wevansaa@bloglovin.com,233.125.192.48,1994-12-26 23:43:42\n+372,Mark,mmarshallab@tumblr.com,114.74.60.47,2016-09-29 18:03:01\n+373,Andrew,amartinezac@google.cn,182.54.37.130,1976-06-06 17:04:17\n+374,Helen,hmoralesad@e-recht24.de,42.45.4.123,1977-03-28 19:06:59\n+375,Bonnie,bstoneae@php.net,196.149.79.137,1970-02-05 17:05:58\n+376,Douglas,dfreemanaf@nasa.gov,215.65.124.218,2008-11-20 21:51:55\n+377,Willie,wwestag@army.mil,35.189.92.118,1992-07-24 05:08:08\n+378,Cheryl,cwagnerah@upenn.edu,228.239.222.141,2010-01-25 06:29:01\n+379,Sandra,swardai@baidu.com,63.11.113.240,1985-05-23 08:07:37\n+380,Julie,jrobinsonaj@jugem.jp,110.58.202.50,2015-03-05 09:42:07\n+381,Larry,lwagnerak@shop-pro.jp,98.234.25.24,1975-07-22 22:22:02\n+382,Juan,jcastilloal@yelp.com,24.174.74.202,2007-01-17 09:32:43\n+383,Donna,dfrazieram@artisteer.com,205.26.147.45,1990-02-11 20:55:46\n+384,Rachel,rfloresan@w3.org,109.60.216.162,1983-05-22 22:42:18\n+385,Robert,rreynoldsao@theguardian.com,122.65.209.130,2009-05-01 18:02:51\n+386,Donald,dbradleyap@etsy.com,42.54.35.126,1997-01-16 16:31:52\n+387,Rachel,rfisheraq@nih.gov,160.243.250.45,2006-02-17 22:05:49\n+388,Nicholas,nhamiltonar@princeton.edu,156.211.37.111,1976-06-21 03:36:29\n+389,Timothy,twhiteas@ca.gov,36.128.23.70,1975-09-24 03:51:18\n+390,Diana,dbradleyat@odnoklassniki.ru,44.102.120.184,1983-04-27 09:02:50\n+391,Billy,bfowlerau@jimdo.com,91.200.68.196,1995-01-29 06:57:35\n+392,Bruce,bandrewsav@ucoz.com,48.12.101.125,1992-10-27 04:31:39\n+393,Linda,lromeroaw@usa.gov,100.71.233.19,1992-06-08 15:13:18\n+394,Debra,dwatkinsax@ucoz.ru,52.160.233.193,2001-11-11 06:51:01\n+395,Katherine,kburkeay@wix.com,151.156.242.141,2010-06-14 19:54:28\n+396,Martha,mharrisonaz@youku.com,21.222.10.199,1989-10-16 14:17:55\n+397,Dennis,dwellsb0@youtu.be,103.16.29.3,1985-12-21 06:05:51\n+398,Gloria,grichardsb1@bloglines.com,90.147.120.234,1982-08-27 01:04:43\n+399,Brenda,bfullerb2@t.co,33.253.63.90,2011-04-20 05:00:35\n+400,Larry,lhendersonb3@disqus.com,88.95.132.128,1982-08-31 02:15:12\n+401,Richard,rlarsonb4@wisc.edu,13.48.231.150,1979-04-15 14:08:09\n+402,Terry,thuntb5@usa.gov,65.91.103.240,1998-05-15 11:50:49\n+403,Harry,hburnsb6@nasa.gov,33.38.21.244,1981-04-12 14:02:20\n+404,Diana,dellisb7@mlb.com,218.229.81.135,1997-01-29 00:17:25\n+405,Jack,jburkeb8@tripadvisor.com,210.227.182.216,1984-03-09 17:24:03\n+406,Julia,jlongb9@fotki.com,10.210.12.104,2005-10-26 03:54:13\n+407,Lois,lscottba@msu.edu,188.79.136.138,1973-02-02 18:40:39\n+408,Sandra,shendersonbb@shareasale.com,114.171.220.108,2012-06-09 18:22:26\n+409,Irene,isanchezbc@cdbaby.com,109.255.50.119,1983-09-28 21:11:27\n+410,Emily,ebrooksbd@bandcamp.com,227.81.93.79,1970-08-31 21:08:01\n+411,Michelle,mdiazbe@businessweek.com,236.249.6.226,1993-05-22 08:07:07\n+412,Tammy,tbennettbf@wisc.edu,145.253.239.152,1978-12-31 20:24:51\n+413,Christine,cgreenebg@flickr.com,97.25.140.118,1978-07-17 12:55:30\n+414,Patricia,pgarzabh@tuttocitta.it,139.246.192.211,1984-02-27 13:40:08\n+415,Kimberly,kromerobi@aol.com,73.56.88.247,1976-09-16 14:22:04\n+416,George,gjohnstonbj@fda.gov,240.36.245.185,1979-07-24 14:36:02\n+417,Eugene,efullerbk@sciencedaily.com,42.38.105.140,2012-09-12 01:56:41\n+418,Andrea,astevensbl@goo.gl,31.152.207.204,1979-05-24 11:06:21\n+419,Shirley,sreidbm@scientificamerican.com,103.60.31.241,1984-02-23 04:07:41\n+420,Terry,tmorenobn@blinklist.com,92.161.34.42,1994-06-25 14:01:35\n+421,Christopher,cmorenobo@go.com,158.86.176.82,1973-09-05 09:18:47\n+422,Dennis,dhansonbp@ning.com,40.160.81.75,1982-01-20 10:19:41\n+423,Beverly,brussellbq@de.vu,138.32.56.204,1997-11-06 07:20:19\n+424,Howard,hparkerbr@163.com,103.171.134.171,2015-06-24 15:37:10\n+425,Helen,hmccoybs@fema.gov,61.200.4.71,1995-06-20 08:59:10\n+426,Ann,ahudsonbt@cafepress.com,239.187.71.125,1977-04-11 07:59:28\n+427,Tina,twestbu@nhs.uk,80.213.117.74,1992-08-19 05:54:44\n+428,Terry,tnguyenbv@noaa.gov,21.93.118.95,1991-09-19 23:22:55\n+429,Ashley,aburtonbw@wix.com,233.176.205.109,2009-11-10 05:01:20\n+430,Eric,emyersbx@1und1.de,168.91.212.67,1987-08-10 07:16:20\n+431,Barbara,blittleby@lycos.com,242.14.189.239,2008-08-02 12:13:04\n+432,Sean,sevansbz@instagram.com,14.39.177.13,2007-04-16 17:28:49\n+433,Shirley,sburtonc0@newsvine.com,34.107.138.76,1980-12-10 02:19:29\n+434,Patricia,pfreemanc1@so-net.ne.jp,219.213.142.117,1987-03-01 02:25:45\n+435,Paula,pfosterc2@vkontakte.ru,227.14.138.141,1972-09-22 12:59:34\n+436,Nicole,nstewartc3@1688.com,8.164.23.115,1998-10-27 00:10:17\n+437,Earl,ekimc4@ovh.net,100.26.244.177,2013-01-22 10:05:46\n+438,Beverly,breedc5@reuters.com,174.12.226.27,1974-09-22 07:29:36\n+439,Lawrence,lbutlerc6@a8.net,105.164.42.164,1992-06-05 00:43:40\n+440,Charles,cmoorec7@ucoz.com,252.197.131.69,1990-04-09 02:34:05\n+441,Alice,alawsonc8@live.com,183.73.220.232,1989-02-28 09:11:04\n+442,Dorothy,dcarpenterc9@arstechnica.com,241.47.200.14,2005-05-02 19:57:21\n+443,Carolyn,cfowlerca@go.com,213.109.55.202,1978-09-10 20:18:20\n+444,Anthony,alongcb@free.fr,169.221.158.204,1984-09-13 01:59:23\n+445,Annie,amoorecc@e-recht24.de,50.34.148.61,2009-03-26 03:41:07\n+446,Carlos,candrewscd@ihg.com,236.69.59.212,1972-03-29 22:42:48\n+447,Beverly,bramosce@google.ca,164.250.184.49,1982-11-10 04:34:01\n+448,Teresa,tlongcf@umich.edu,174.88.53.223,1987-05-17 12:48:00\n+449,Roy,rboydcg@uol.com.br,91.58.243.215,1974-06-16 17:59:54\n+450,Ashley,afieldsch@tamu.edu,130.138.11.126,1983-09-15 05:52:36\n+451,Judith,jhawkinsci@cmu.edu,200.187.103.245,2003-10-22 12:24:03\n+452,Rebecca,rwestcj@ocn.ne.jp,72.85.3.103,1980-11-13 11:01:26\n+453,Raymond,rporterck@infoseek.co.jp,146.33.216.151,1982-05-17 23:58:03\n+454,Janet,jmarshallcl@odnoklassniki.ru,52.46.193.166,1998-10-04 00:02:21\n+455,Shirley,speterscm@salon.com,248.126.31.15,1987-01-30 06:04:59\n+456,Annie,abowmancn@economist.com,222.213.248.59,2006-03-14 23:52:59\n+457,Jean,jlarsonco@blogspot.com,71.41.25.195,2007-09-08 23:49:45\n+458,Phillip,pmoralescp@stanford.edu,74.119.87.28,2011-03-14 20:25:40\n+459,Norma,nrobinsoncq@economist.com,28.225.21.54,1989-10-21 01:22:43\n+460,Kimberly,kclarkcr@dion.ne.jp,149.171.132.153,2008-06-27 02:27:30\n+461,Ruby,rmorriscs@ucla.edu,177.85.163.249,2016-01-28 16:43:44\n+462,Jonathan,jcastilloct@tripod.com,78.4.28.77,2000-05-24 17:33:06\n+463,Edward,ebryantcu@jigsy.com,140.31.98.193,1992-12-17 08:32:47\n+464,Chris,chamiltoncv@eepurl.com,195.171.234.206,1970-12-05 03:42:19\n+465,Michael,mweavercw@reference.com,7.233.133.213,1987-03-29 02:30:54\n+466,Howard,hlawrencecx@businessweek.com,113.225.124.224,1990-07-30 07:20:57\n+467,Philip,phowardcy@comsenz.com,159.170.247.249,2010-10-15 10:18:37\n+468,Mary,mmarshallcz@xing.com,125.132.189.70,2007-07-19 13:48:47\n+469,Scott,salvarezd0@theguardian.com,78.49.103.230,1987-10-31 06:10:44\n+470,Wayne,wcarrolld1@blog.com,238.1.120.204,1980-11-19 03:26:10\n+471,Jennifer,jwoodsd2@multiply.com,92.20.224.49,2010-05-06 22:17:04\n+472,Raymond,rwelchd3@toplist.cz,176.158.35.240,2007-12-12 19:02:51\n+473,Steven,sdixond4@wisc.edu,167.55.237.52,1984-05-05 11:44:37\n+474,Ralph,rjamesd5@ameblo.jp,241.190.50.133,2000-07-06 08:44:37\n+475,Jason,jrobinsond6@hexun.com,138.119.139.56,2006-02-03 05:27:45\n+476,Doris,dwoodd7@fema.gov,180.220.156.190,1978-05-11 20:14:20\n+477,Elizabeth,eberryd8@youtu.be,74.188.53.229,2006-11-18 08:29:06\n+478,Irene,igilbertd9@privacy.gov.au,194.152.218.1,1985-09-17 02:46:52\n+479,Jessica,jdeanda@ameblo.jp,178.103.93.118,1974-06-07 19:04:05\n+480,Rachel,ralvarezdb@phoca.cz,17.22.223.174,1999-03-08 02:43:25\n+481,Kenneth,kthompsondc@shinystat.com,229.119.91.234,2007-05-15 13:17:32\n+482,Harold,hmurraydd@parallels.com,133.26.188.80,1993-11-15 03:42:07\n+483,Paula,phowellde@samsung.com,34.215.28.216,1993-11-29 15:55:00\n+484,Ruth,rpiercedf@tripadvisor.com,111.30.130.123,1986-08-17 10:19:38\n+485,Phyllis,paustindg@vk.com,50.84.34.178,1994-04-13 03:05:24\n+486,Laura,lfosterdh@usnews.com,37.8.101.33,2001-06-30 08:58:59\n+487,Eric,etaylordi@com.com,103.183.253.45,2006-09-15 20:18:46\n+488,Doris,driveradj@prweb.com,247.16.2.199,1989-05-08 09:27:09\n+489,Ryan,rhughesdk@elegantthemes.com,103.234.153.232,1989-08-01 18:36:06\n+490,Steve,smoralesdl@jigsy.com,3.76.84.207,2011-03-13 17:01:05\n+491,Louis,lsullivandm@who.int,78.135.44.208,1975-11-26 16:01:23\n+492,Catherine,ctuckerdn@seattletimes.com,93.137.106.21,1990-03-13 16:14:56\n+493,Ann,adixondo@gmpg.org,191.136.222.111,2002-06-05 14:22:18\n+494,Johnny,jhartdp@amazon.com,103.252.198.39,1988-07-30 23:54:49\n+495,Susan,srichardsdq@skype.com,126.247.192.11,2005-01-09 12:08:14\n+496,Brenda,bparkerdr@skype.com,63.232.216.86,1974-05-18 05:58:29\n+497,Tammy,tmurphyds@constantcontact.com,56.56.37.112,2014-08-05 18:22:25\n+498,Larry,lhayesdt@wordpress.com,162.146.13.46,1997-02-26 14:01:53\n+499,,ethomasdu@hhs.gov,6.241.88.250,2007-09-14 13:03:34\n+500,Paula,pshawdv@networksolutions.com,123.27.47.249,2003-10-30 21:19:20\ndiff --git a/test/integration/005_simple_seed_test/test_simple_seed.py b/test/integration/005_simple_seed_test/test_simple_seed.py\nindex 94f6fa86dc2..2d834e675e7 100644\n--- a/test/integration/005_simple_seed_test/test_simple_seed.py\n+++ b/test/integration/005_simple_seed_test/test_simple_seed.py\n@@ -1,6 +1,11 @@\n+import os\n+\n from test.integration.base import DBTIntegrationTest, use_profile\n \n from dbt.exceptions import CompilationException\n+from dbt.compat import open_file\n+\n+\n \n class TestSimpleSeed(DBTIntegrationTest):\n \n@@ -162,5 +167,33 @@ def test_postgres_dbt_run_skips_seeds(self):\n self.run_dbt(['seed'])\n \n \n+class TestSimpleSeedWithBOM(DBTIntegrationTest):\n+\n+ def setUp(self):\n+ DBTIntegrationTest.setUp(self)\n+ self.run_sql_file(\"test/integration/005_simple_seed_test/seed.sql\")\n \n+ @property\n+ def schema(self):\n+ return \"simple_seed_005\"\n \n+ @property\n+ def models(self):\n+ return \"test/integration/005_simple_seed_test/models\"\n+\n+ @property\n+ def project_config(self):\n+ return {\n+ \"data-paths\": ['test/integration/005_simple_seed_test/data-bom']\n+ }\n+\n+ @use_profile('postgres')\n+ def test_simple_seed(self):\n+ # first make sure nobody \"fixed\" the file by accident\n+ seed_path = os.path.join(self.config.data_paths[0], 'seed_bom.csv')\n+ # 'test/integration/005_simple_seed_test/data-bom/seed_bom.csv'\n+ with open_file(seed_path) as fp:\n+ self.assertEqual(fp.read(1), u'\\ufeff')\n+ results = self.run_dbt([\"seed\"])\n+ self.assertEqual(len(results), 1)\n+ self.assertTablesEqual(\"seed_bom\", \"seed_expected\")\ndiff --git a/test/unit/test_agate_helper.py b/test/unit/test_agate_helper.py\nindex ba8c4785cec..e39afcba009 100644\n--- a/test/unit/test_agate_helper.py\n+++ b/test/unit/test_agate_helper.py\n@@ -13,6 +13,8 @@\n 1,n,test,3.2,20180806T11:33:29.320Z,True,NULL\n 2,y,asdf,900,20180806T11:35:29.320Z,False,a string\"\"\"\n \n+SAMPLE_CSV_BOM_DATA = u'\\ufeff' + SAMPLE_CSV_DATA\n+\n \n EXPECTED = [\n [1, 'n', 'test', Decimal('3.2'),\n@@ -41,6 +43,15 @@ def test_from_csv(self):\n for idx, row in enumerate(tbl):\n self.assertEqual(list(row), EXPECTED[idx])\n \n+ def test_bom_from_csv(self):\n+ path = os.path.join(self.tempdir, 'input.csv')\n+ with open(path, 'wb') as fp:\n+ fp.write(SAMPLE_CSV_BOM_DATA.encode('utf-8'))\n+ tbl = agate_helper.from_csv(path)\n+ self.assertEqual(len(tbl), len(EXPECTED))\n+ for idx, row in enumerate(tbl):\n+ self.assertEqual(list(row), EXPECTED[idx])\n+\n def test_from_data(self):\n column_names = ['a', 'b', 'c', 'd', 'e', 'f', 'g']\n data = [\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2376,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-1406@4730789"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":1406,"string":"1,406"},"title":{"kind":"string","value":"Fix run operation return codes (#1377)"},"body":{"kind":"string","value":"Fixes #1377 \r\n\r\nWhen we run an operation, set the return code on error.\r\n\r\nAlso, since wilt-chamberlain totally broke the run-operation command in multiple ways, I fixed all that. And added tests so I don't do that again.\r\n\r\nI also added a commit call that happens after successfully executing the macro. Maybe that would be better as a flag? I just wanted it for testing, but I can't really see _not_ wanting to commit."},"created_at":{"kind":"string","value":"2019-04-17T17:30:00Z"},"problem_statement":{"kind":"string","value":"Fail with nonzero exit code if run-operation task encounters an unhandled exception\n## Issue\r\n\r\n### Issue description\r\nIf a run-operation macro fails with an exception (ie. unable to connect to database, invalid SQL, etc), dbt should exit with a nonzero exit code. Moreover, run-operations should generally go through a similar code-path to models, seeds, etc, such that this happens automatically.\r\n\r\n### Results\r\nThe info logs showed that an exception had occurred, but the task exited with exit code = 0\r\n\r\n### System information\r\nThe output of `dbt --version`:\r\n```\r\n0.13.0\r\n```"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"## Issue\r\n\r\n### Issue description\r\nIf a run-operation macro fails with an exception (ie. unable to connect to database, invalid SQL, etc), dbt should exit with a nonzero exit code. Moreover, run-operations should generally go through a similar code-path to models, seeds, etc, such that this happens automatically.\r\n\r\n### Results\r\nThe info logs showed that an exception had occurred, but the task exited with exit code = 0\r\n\r\n### System information\r\nThe output of `dbt --version`:\r\n```\r\n0.13.0\r\n```","number":1377,"title":"Fail with nonzero exit code if run-operation task encounters an unhandled exception"}],"string":"[\n {\n \"body\": \"## Issue\\r\\n\\r\\n### Issue description\\r\\nIf a run-operation macro fails with an exception (ie. unable to connect to database, invalid SQL, etc), dbt should exit with a nonzero exit code. Moreover, run-operations should generally go through a similar code-path to models, seeds, etc, such that this happens automatically.\\r\\n\\r\\n### Results\\r\\nThe info logs showed that an exception had occurred, but the task exited with exit code = 0\\r\\n\\r\\n### System information\\r\\nThe output of `dbt --version`:\\r\\n```\\r\\n0.13.0\\r\\n```\",\n \"number\": 1377,\n \"title\": \"Fail with nonzero exit code if run-operation task encounters an unhandled exception\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"4dd80567e15580079b6b72cf6ea9eed46c9b5953"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"473078986ca7905190bbf20ec3422e24e3d56c20\",\n \"head_commit_message\": \"PR feedback: run_unsafe -> _run_unsafe\",\n \"patch_to_review\": \"diff --git a/core/dbt/task/run_operation.py b/core/dbt/task/run_operation.py\\nindex 6ea5d91bd98..10fe0b1e04a 100644\\n--- a/core/dbt/task/run_operation.py\\n+++ b/core/dbt/task/run_operation.py\\n@@ -1,6 +1,5 @@\\n from dbt.logger import GLOBAL_LOGGER as logger\\n-\\n-from dbt.task.base import BaseTask\\n+from dbt.task.base import ConfiguredTask\\n from dbt.adapters.factory import get_adapter\\n from dbt.loader import GraphLoader\\n \\n@@ -9,7 +8,7 @@\\n import dbt.exceptions\\n \\n \\n-class RunOperationTask(BaseTask):\\n+class RunOperationTask(ConfiguredTask):\\n def _get_macro_parts(self):\\n macro_name = self.args.macro\\n if '.' in macro_name:\\n@@ -22,19 +21,44 @@ def _get_macro_parts(self):\\n def _get_kwargs(self):\\n return dbt.utils.parse_cli_vars(self.args.args)\\n \\n- def run(self):\\n+ def _run_unsafe(self):\\n manifest = GraphLoader.load_all(self.config)\\n adapter = get_adapter(self.config)\\n \\n package_name, macro_name = self._get_macro_parts()\\n macro_kwargs = self._get_kwargs()\\n \\n- res = adapter.execute_macro(\\n- macro_name,\\n- project=package_name,\\n- kwargs=macro_kwargs,\\n- manifest=manifest,\\n- connection_name=\\\"macro_{}\\\".format(macro_name)\\n- )\\n+ with adapter.connection_named('macro_{}'.format(macro_name)):\\n+ res = adapter.execute_macro(\\n+ macro_name,\\n+ project=package_name,\\n+ kwargs=macro_kwargs,\\n+ manifest=manifest\\n+ )\\n+ adapter.commit_if_has_connection()\\n \\n return res\\n+\\n+ def run(self):\\n+ try:\\n+ result = self._run_unsafe()\\n+ except dbt.exceptions.Exception as exc:\\n+ logger.error(\\n+ 'Encountered a dbt exception while running a macro: {}'\\n+ .format(exc)\\n+ )\\n+ logger.debug('', exc_info=True)\\n+ return False, None\\n+ except Exception as exc:\\n+ logger.error(\\n+ 'Encountered an uncaught exception while running a macro: {}'\\n+ .format(exc)\\n+ )\\n+ logger.debug('', exc_info=True)\\n+ return False, None\\n+ else:\\n+ return True, result\\n+\\n+ def interpret_results(self, results):\\n+ success, _ = results\\n+ return success\\ndiff --git a/test/integration/044_run_operations_test/macros/happy_macros.sql b/test/integration/044_run_operations_test/macros/happy_macros.sql\\nnew file mode 100644\\nindex 00000000000..3df736b0cd4\\n--- /dev/null\\n+++ b/test/integration/044_run_operations_test/macros/happy_macros.sql\\n@@ -0,0 +1,16 @@\\n+{% macro no_args() %}\\n+ {% if execute %}\\n+ {% call statement() %}\\n+ create table \\\"{{ schema }}\\\".\\\"no_args\\\" (id int)\\n+ {% endcall %}\\n+ {% endif %}\\n+{% endmacro %}\\n+\\n+\\n+{% macro table_name_args(table_name) %}\\n+ {% if execute %}\\n+ {% call statement() %}\\n+ create table \\\"{{ schema }}\\\".\\\"{{ table_name }}\\\" (id int)\\n+ {% endcall %}\\n+ {% endif %}\\n+{% endmacro %}\\ndiff --git a/test/integration/044_run_operations_test/macros/sad_macros.sql b/test/integration/044_run_operations_test/macros/sad_macros.sql\\nnew file mode 100644\\nindex 00000000000..4f2c80bc40f\\n--- /dev/null\\n+++ b/test/integration/044_run_operations_test/macros/sad_macros.sql\\n@@ -0,0 +1,7 @@\\n+{% macro syntax_error() %}\\n+ {% if execute %}\\n+ {% call statement() %}\\n+ select NOPE NOT A VALID QUERY\\n+ {% endcall %}\\n+ {% endif %}\\n+{% endmacro %}\\ndiff --git a/test/integration/044_run_operations_test/test_run_operations.py b/test/integration/044_run_operations_test/test_run_operations.py\\nnew file mode 100644\\nindex 00000000000..2708ae84e45\\n--- /dev/null\\n+++ b/test/integration/044_run_operations_test/test_run_operations.py\\n@@ -0,0 +1,52 @@\\n+from test.integration.base import DBTIntegrationTest, use_profile\\n+import yaml\\n+\\n+\\n+class TestOperations(DBTIntegrationTest):\\n+ @property\\n+ def schema(self):\\n+ return \\\"run_operations_044\\\"\\n+\\n+ @property\\n+ def models(self):\\n+ return \\\"test/integration/044_run_operations_test/models\\\"\\n+\\n+ @property\\n+ def project_config(self):\\n+ return {\\n+ \\\"macro-paths\\\": ['test/integration/044_run_operations_test/macros'],\\n+ }\\n+\\n+ def run_operation(self, macro, expect_pass=True, extra_args=None, **kwargs):\\n+ args = ['run-operation']\\n+ if macro:\\n+ args.extend(('--macro', macro))\\n+ if kwargs:\\n+ args.extend(('--args', yaml.safe_dump(kwargs)))\\n+ if extra_args:\\n+ args.extend(extra_args)\\n+ return self.run_dbt(args, expect_pass=expect_pass)\\n+\\n+ @use_profile('postgres')\\n+ def test__postgres_macro_noargs(self):\\n+ self.run_operation('no_args')\\n+ self.assertTableDoesExist('no_args')\\n+\\n+ @use_profile('postgres')\\n+ def test__postgres_macro_args(self):\\n+ self.run_operation('table_name_args', table_name='my_fancy_table')\\n+ self.assertTableDoesExist('my_fancy_table')\\n+\\n+ @use_profile('postgres')\\n+ def test__postgres_macro_exception(self):\\n+ self.run_operation('syntax_error', False)\\n+\\n+ @use_profile('postgres')\\n+ def test__postgres_macro_missing(self):\\n+ self.run_operation('this_macro_does_not_exist', False)\\n+\\n+ @use_profile('postgres')\\n+ def test__postgres_cannot_connect(self):\\n+ self.run_operation('no_args',\\n+ extra_args=['--target', 'noaccess'],\\n+ expect_pass=False)\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -22,19 +21,44 @@ def _get_macro_parts(self):\n def _get_kwargs(self):\n return dbt.utils.parse_cli_vars(self.args.args)\n \n- def run(self):\n+ def _run_unsafe(self):\n manifest = GraphLoader.load_all(self.config)\n adapter = get_adapter(self.config)\n \n package_name, macro_name = self._get_macro_parts()\n macro_kwargs = self._get_kwargs()\n \n- res = adapter.execute_macro(\n- macro_name,\n- project=package_name,\n- kwargs=macro_kwargs,\n- manifest=manifest,\n- connection_name=\"macro_{}\".format(macro_name)\n- )\n+ with adapter.connection_named('macro_{}'.format(macro_name)):\n+ res = adapter.execute_macro(\n+ macro_name,\n+ project=package_name,\n+ kwargs=macro_kwargs,\n+ manifest=manifest\n+ )\n+ adapter.commit_if_has_connection()\n \n return res\n+\n+ def run(self):\n+ try:\n+ result = self._run_unsafe()\n+ except dbt.exceptions.Exception as exc:\n+ logger.error(\n+ 'Encountered a dbt exception while running a macro: {}'","line":null,"original_line":47,"original_start_line":null,"path":"core/dbt/task/run_operation.py","start_line":null,"text":"@user1:\nThis is an exception that dbt is aware of, but it's not a dbt exception per se. I just don't want folks to think that dbt did something wrong if their operations fail. Can we make this say:\r\n```\r\nEncountered an error while running an operation:\r\n```"}],"string":"[\n {\n \"diff_hunk\": \"@@ -22,19 +21,44 @@ def _get_macro_parts(self):\\n def _get_kwargs(self):\\n return dbt.utils.parse_cli_vars(self.args.args)\\n \\n- def run(self):\\n+ def _run_unsafe(self):\\n manifest = GraphLoader.load_all(self.config)\\n adapter = get_adapter(self.config)\\n \\n package_name, macro_name = self._get_macro_parts()\\n macro_kwargs = self._get_kwargs()\\n \\n- res = adapter.execute_macro(\\n- macro_name,\\n- project=package_name,\\n- kwargs=macro_kwargs,\\n- manifest=manifest,\\n- connection_name=\\\"macro_{}\\\".format(macro_name)\\n- )\\n+ with adapter.connection_named('macro_{}'.format(macro_name)):\\n+ res = adapter.execute_macro(\\n+ macro_name,\\n+ project=package_name,\\n+ kwargs=macro_kwargs,\\n+ manifest=manifest\\n+ )\\n+ adapter.commit_if_has_connection()\\n \\n return res\\n+\\n+ def run(self):\\n+ try:\\n+ result = self._run_unsafe()\\n+ except dbt.exceptions.Exception as exc:\\n+ logger.error(\\n+ 'Encountered a dbt exception while running a macro: {}'\",\n \"line\": null,\n \"original_line\": 47,\n \"original_start_line\": null,\n \"path\": \"core/dbt/task/run_operation.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nThis is an exception that dbt is aware of, but it's not a dbt exception per se. I just don't want folks to think that dbt did something wrong if their operations fail. Can we make this say:\\r\\n```\\r\\nEncountered an error while running an operation:\\r\\n```\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"ca02a5851918bf0325b9b3688b4abadf5e1cf5df"},"merged_patch":{"kind":"string","value":"diff --git a/core/dbt/task/run_operation.py b/core/dbt/task/run_operation.py\nindex 6ea5d91bd98..fe90649d1e0 100644\n--- a/core/dbt/task/run_operation.py\n+++ b/core/dbt/task/run_operation.py\n@@ -1,6 +1,5 @@\n from dbt.logger import GLOBAL_LOGGER as logger\n-\n-from dbt.task.base import BaseTask\n+from dbt.task.base import ConfiguredTask\n from dbt.adapters.factory import get_adapter\n from dbt.loader import GraphLoader\n \n@@ -9,7 +8,7 @@\n import dbt.exceptions\n \n \n-class RunOperationTask(BaseTask):\n+class RunOperationTask(ConfiguredTask):\n def _get_macro_parts(self):\n macro_name = self.args.macro\n if '.' in macro_name:\n@@ -22,19 +21,44 @@ def _get_macro_parts(self):\n def _get_kwargs(self):\n return dbt.utils.parse_cli_vars(self.args.args)\n \n- def run(self):\n+ def _run_unsafe(self):\n manifest = GraphLoader.load_all(self.config)\n adapter = get_adapter(self.config)\n \n package_name, macro_name = self._get_macro_parts()\n macro_kwargs = self._get_kwargs()\n \n- res = adapter.execute_macro(\n- macro_name,\n- project=package_name,\n- kwargs=macro_kwargs,\n- manifest=manifest,\n- connection_name=\"macro_{}\".format(macro_name)\n- )\n+ with adapter.connection_named('macro_{}'.format(macro_name)):\n+ adapter.clear_transaction()\n+ res = adapter.execute_macro(\n+ macro_name,\n+ project=package_name,\n+ kwargs=macro_kwargs,\n+ manifest=manifest\n+ )\n \n return res\n+\n+ def run(self):\n+ try:\n+ result = self._run_unsafe()\n+ except dbt.exceptions.Exception as exc:\n+ logger.error(\n+ 'Encountered an error while running operation: {}'\n+ .format(exc)\n+ )\n+ logger.debug('', exc_info=True)\n+ return False, None\n+ except Exception as exc:\n+ logger.error(\n+ 'Encountered an uncaught exception while running operation: {}'\n+ .format(exc)\n+ )\n+ logger.debug('', exc_info=True)\n+ return False, None\n+ else:\n+ return True, result\n+\n+ def interpret_results(self, results):\n+ success, _ = results\n+ return success\ndiff --git a/test/integration/044_run_operations_test/macros/happy_macros.sql b/test/integration/044_run_operations_test/macros/happy_macros.sql\nnew file mode 100644\nindex 00000000000..6170ebc7657\n--- /dev/null\n+++ b/test/integration/044_run_operations_test/macros/happy_macros.sql\n@@ -0,0 +1,24 @@\n+{% macro no_args() %}\n+ {% if execute %}\n+ {% call statement(auto_begin=True) %}\n+ create table \"{{ schema }}\".\"no_args\" (id int);\n+ commit;\n+ {% endcall %}\n+ {% endif %}\n+{% endmacro %}\n+\n+\n+{% macro table_name_args(table_name) %}\n+ {% if execute %}\n+ {% call statement(auto_begin=True) %}\n+ create table \"{{ schema }}\".\"{{ table_name }}\" (id int);\n+ commit;\n+ {% endcall %}\n+ {% endif %}\n+{% endmacro %}\n+\n+{% macro vacuum(table_name) %}\n+ {% call statement(auto_begin=false) %}\n+ vacuum \"{{ schema }}\".\"{{ table_name }}\"\n+ {% endcall %}\n+{% endmacro %}\ndiff --git a/test/integration/044_run_operations_test/macros/sad_macros.sql b/test/integration/044_run_operations_test/macros/sad_macros.sql\nnew file mode 100644\nindex 00000000000..4f2c80bc40f\n--- /dev/null\n+++ b/test/integration/044_run_operations_test/macros/sad_macros.sql\n@@ -0,0 +1,7 @@\n+{% macro syntax_error() %}\n+ {% if execute %}\n+ {% call statement() %}\n+ select NOPE NOT A VALID QUERY\n+ {% endcall %}\n+ {% endif %}\n+{% endmacro %}\ndiff --git a/test/integration/044_run_operations_test/models/model.sql b/test/integration/044_run_operations_test/models/model.sql\nnew file mode 100644\nindex 00000000000..43258a71464\n--- /dev/null\n+++ b/test/integration/044_run_operations_test/models/model.sql\n@@ -0,0 +1 @@\n+select 1 as id\ndiff --git a/test/integration/044_run_operations_test/test_run_operations.py b/test/integration/044_run_operations_test/test_run_operations.py\nnew file mode 100644\nindex 00000000000..c66de6d8af5\n--- /dev/null\n+++ b/test/integration/044_run_operations_test/test_run_operations.py\n@@ -0,0 +1,58 @@\n+from test.integration.base import DBTIntegrationTest, use_profile\n+import yaml\n+\n+\n+class TestOperations(DBTIntegrationTest):\n+ @property\n+ def schema(self):\n+ return \"run_operations_044\"\n+\n+ @property\n+ def models(self):\n+ return \"test/integration/044_run_operations_test/models\"\n+\n+ @property\n+ def project_config(self):\n+ return {\n+ \"macro-paths\": ['test/integration/044_run_operations_test/macros'],\n+ }\n+\n+ def run_operation(self, macro, expect_pass=True, extra_args=None, **kwargs):\n+ args = ['run-operation']\n+ if macro:\n+ args.extend(('--macro', macro))\n+ if kwargs:\n+ args.extend(('--args', yaml.safe_dump(kwargs)))\n+ if extra_args:\n+ args.extend(extra_args)\n+ return self.run_dbt(args, expect_pass=expect_pass)\n+\n+ @use_profile('postgres')\n+ def test__postgres_macro_noargs(self):\n+ self.run_operation('no_args')\n+ self.assertTableDoesExist('no_args')\n+\n+ @use_profile('postgres')\n+ def test__postgres_macro_args(self):\n+ self.run_operation('table_name_args', table_name='my_fancy_table')\n+ self.assertTableDoesExist('my_fancy_table')\n+\n+ @use_profile('postgres')\n+ def test__postgres_macro_exception(self):\n+ self.run_operation('syntax_error', False)\n+\n+ @use_profile('postgres')\n+ def test__postgres_macro_missing(self):\n+ self.run_operation('this_macro_does_not_exist', False)\n+\n+ @use_profile('postgres')\n+ def test__postgres_cannot_connect(self):\n+ self.run_operation('no_args',\n+ extra_args=['--target', 'noaccess'],\n+ expect_pass=False)\n+\n+ @use_profile('postgres')\n+ def test__postgres_vacuum(self):\n+ self.run_dbt(['run'])\n+ # this should succeed\n+ self.run_operation('vacuum', table_name='model')\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2377,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-1436@e043643"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":1436,"string":"1,436"},"title":{"kind":"string","value":"dbt ls command (#467)"},"body":{"kind":"string","value":"Fixes #467\r\n\r\nOne change I had to make: the `original_file_path` now points at the actual original file path, rather than a weird combination of the compiled path + the root of the search that sometimes doesn't exist. Models and such retained their original correct paths.\r\n"},"created_at":{"kind":"string","value":"2019-05-01T20:59:02Z"},"problem_statement":{"kind":"string","value":"new command: dbt ls\nList models selected by CLI args. Eg.\r\n\r\n```\r\n$ dbt ls --models salesforce.* --exclude salesforce_accounts\r\nmodels/salesforce/salesforce_users.sql\r\nmodels/salesforce/salesforce_contacts.sql\r\nmodels/salesforce/salesforce_leads.sql\r\n....\r\n```\r\n\r\nThis will be especially valuable when dbt supports selecting models by tags, materialization type, etc, etc.\r\n\r\nGreat idea @emilielimaburke"},"hints_text":{"kind":"string","value":"I think I'd prefer the command to be `list` as opposed to `ls`, and for it to just return the model names.\r\n```\r\n$ dbt list --models salesforce.* --exclude salesforce_accounts\r\nsalesforce_users\r\nsalesforce_contacts\r\nsalesforce_leads\r\n....\r\n```\r\n\r\nMaybe it could have a flag like `--verbose` that shows the fqn versions:\r\n\r\n```\r\n$ dbt list --models salesforce.* --exclude salesforce_accounts --verbose\r\nsalesforce.salesforce_users\r\nsalesforce.salesforce_contacts\r\nsalesforce.salesforce_leads\r\n....\r\n```\r\n\r\nI personally am less interested in the file paths, especially since the file paths don't include the name of my own project.\r\n\r\nI'm not sure what the ordering of the output should be. Probably alphabetical? But I can also imagine someone might want to see them in the order they appear in the DAG, but that gets tricky.\nReally nice spec here, @clrcrl! Let's do it!\r\n\r\n```\r\n$ dbt list \r\n --resource_type {model|source|...|default|all}\r\n --select {list of selectors}\r\n --exclude {list of selectors}\r\n --output {json|name|path|selector}\r\n```\r\n\r\nAvailable resource types:\r\n- **default**:\r\n - model\r\n - archive\r\n - seed\r\n - test\r\n - source\r\n- **all**:\r\n - default+ \r\n - documentation\r\n - analyses\r\n - macros\r\n\r\nResource type labels:\r\n - default\r\n - all\r\n - refable (everything in default except tests)\r\n\r\nDEFAULTS:\r\n - resource_type = default\r\n - output = selector\r\n\r\nOUTPUTS:\r\n - For name/path/selector, sort alphabetically\r\n - For json, use a dictionary indexed by node `unique_id`... sorting is not applicable. Assume output will be consumed programmatically\r\n\r\nCAVEATS:\r\n - The `path` output should return file paths to resources relative to the cwd\r\n - The `json` output should return serialized ParseNodes (possibly a subset... we care about package name, tags, configs, depends_on, etc.... we care less about sql text). TBD if we normalize the json output across resource types... it's ok if these vary\r\n - Provide a (hidden?) `ls` alias for `list` (is that ok?)\r\n - If no resources are matched, exit with an error code (+ emit a warning?)\r\n - We need to be conscious about the stdout here... supress the logger, push warnings to stderr, etc"},"resolved_issues":{"kind":"list like","value":[{"body":"List models selected by CLI args. Eg.\r\n\r\n```\r\n$ dbt ls --models salesforce.* --exclude salesforce_accounts\r\nmodels/salesforce/salesforce_users.sql\r\nmodels/salesforce/salesforce_contacts.sql\r\nmodels/salesforce/salesforce_leads.sql\r\n....\r\n```\r\n\r\nThis will be especially valuable when dbt supports selecting models by tags, materialization type, etc, etc.\r\n\r\nGreat idea @emilielimaburke","number":467,"title":"new command: dbt ls"}],"string":"[\n {\n \"body\": \"List models selected by CLI args. Eg.\\r\\n\\r\\n```\\r\\n$ dbt ls --models salesforce.* --exclude salesforce_accounts\\r\\nmodels/salesforce/salesforce_users.sql\\r\\nmodels/salesforce/salesforce_contacts.sql\\r\\nmodels/salesforce/salesforce_leads.sql\\r\\n....\\r\\n```\\r\\n\\r\\nThis will be especially valuable when dbt supports selecting models by tags, materialization type, etc, etc.\\r\\n\\r\\nGreat idea @emilielimaburke\",\n \"number\": 467,\n \"title\": \"new command: dbt ls\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"3c8bbddb5f03f4009722ce83568b936652926bd2"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"e043643a54b5912cfaf06b9e1a272571454b7327\",\n \"head_commit_message\": \"Add a new ListTask, and 'dbt list'/'dbt ls'\\n\\nAll tasks now have a 'pre_init_hook' classmethod, called by main\\n - runs after args are parsed, before anything else\",\n \"patch_to_review\": \"diff --git a/core/dbt/logger.py b/core/dbt/logger.py\\nindex f658769172f..a1b3e590bad 100644\\n--- a/core/dbt/logger.py\\n+++ b/core/dbt/logger.py\\n@@ -50,6 +50,11 @@ def notice(self, msg, *args, **kwargs):\\n stdout_handler.setFormatter(logging.Formatter('%(message)s'))\\n stdout_handler.setLevel(NOTICE)\\n \\n+stderr_handler = logging.StreamHandler()\\n+stderr_handler.setFormatter(logging.Formatter('%(message)s'))\\n+stderr_handler.setLevel(WARNING)\\n+\\n+\\n logger = logging.getLogger('dbt')\\n logger.addHandler(stdout_handler)\\n logger.setLevel(DEBUG)\\n@@ -79,6 +84,21 @@ def notice(self, msg, *args, **kwargs):\\n initialized = False\\n \\n \\n+def _swap_handler(logger, old, new):\\n+ if old in logger.handlers:\\n+ logger.handlers.remove(old)\\n+ if new not in logger.handlers:\\n+ logger.addHandler(new)\\n+\\n+\\n+def log_to_stderr(logger):\\n+ _swap_handler(logger, stdout_handler, stderr_handler)\\n+\\n+\\n+def log_to_stdout(logger):\\n+ _swap_handler(logger, stderr_handler, stdout_handler)\\n+\\n+\\n def make_log_dir_if_missing(log_dir):\\n import dbt.clients.system\\n dbt.clients.system.make_directory(log_dir)\\n@@ -99,14 +119,17 @@ def default_formatter():\\n \\n \\n def initialize_logger(debug_mode=False, path=None):\\n- global initialized, logger, stdout_handler\\n+ global initialized, logger, stdout_handler, stderr_handler\\n \\n if initialized:\\n return\\n \\n if debug_mode:\\n+ # we'll only use one of these, but just set both up\\n stdout_handler.setFormatter(default_formatter())\\n stdout_handler.setLevel(DEBUG)\\n+ stderr_handler.setFormatter(default_formatter())\\n+ stderr_handler.setLevel(DEBUG)\\n \\n if path is not None:\\n make_log_dir_if_missing(path)\\ndiff --git a/core/dbt/main.py b/core/dbt/main.py\\nindex d7a869be6ef..f270ed3b21d 100644\\n--- a/core/dbt/main.py\\n+++ b/core/dbt/main.py\\n@@ -22,6 +22,7 @@\\n import dbt.task.serve as serve_task\\n import dbt.task.freshness as freshness_task\\n import dbt.task.run_operation as run_operation_task\\n+from dbt.task.list import ListTask\\n from dbt.task.rpc_server import RPCServerTask\\n from dbt.adapters.factory import reset_adapters\\n \\n@@ -183,6 +184,7 @@ def run_from_args(parsed):\\n log_cache_events(getattr(parsed, 'log_cache_events', False))\\n update_flags(parsed)\\n \\n+ parsed.cls.pre_init_hook()\\n logger.info(\\\"Running with dbt{}\\\".format(dbt.version.installed))\\n \\n # this will convert DbtConfigErrors into RuntimeExceptions\\n@@ -569,6 +571,42 @@ def _build_rpc_subparser(subparsers, base_subparser):\\n return sub\\n \\n \\n+def _build_list_subparser(subparsers, base_subparser):\\n+ sub = subparsers.add_parser(\\n+ 'list',\\n+ parents=[base_subparser],\\n+ help='list models'\\n+ )\\n+ sub.set_defaults(cls=ListTask, which='list')\\n+ resource_values = list(ListTask.ALL_RESOURCE_VALUES) + ['default', 'all']\\n+ sub.add_argument('--resource-type',\\n+ choices=resource_values,\\n+ action='append',\\n+ default=[],\\n+ dest='resource_types')\\n+ sub.add_argument('--output',\\n+ choices=['json', 'name', 'path', 'selector'],\\n+ default='selector')\\n+ sub.add_argument(\\n+ '-s',\\n+ '--select',\\n+ required=False,\\n+ nargs='+',\\n+ help=\\\"Specify the nodes to select.\\\",\\n+ dest='models'\\n+ )\\n+ sub.add_argument(\\n+ '--exclude',\\n+ required=False,\\n+ nargs='+',\\n+ help=\\\"Specify the models to exclude.\\\"\\n+ )\\n+ # in python 3.x you can use the 'aliases' kwarg, but in python 2.7 you get\\n+ # to do this\\n+ subparsers._name_parser_map['ls'] = sub\\n+ return sub\\n+\\n+\\n def parse_args(args):\\n p = DBTArgumentParser(\\n prog='dbt: data build tool',\\n@@ -645,14 +683,15 @@ def parse_args(args):\\n \\n # make the subcommands that have their own subcommands\\n docs_sub = _build_docs_subparser(subs, base_subparser)\\n- docs_subs = docs_sub.add_subparsers()\\n+ docs_subs = docs_sub.add_subparsers(title=\\\"Available sub-commands\\\")\\n source_sub = _build_source_subparser(subs, base_subparser)\\n- source_subs = source_sub.add_subparsers()\\n+ source_subs = source_sub.add_subparsers(title=\\\"Available sub-commands\\\")\\n \\n _build_init_subparser(subs, base_subparser)\\n _build_clean_subparser(subs, base_subparser)\\n _build_debug_subparser(subs, base_subparser)\\n _build_deps_subparser(subs, base_subparser)\\n+ _build_list_subparser(subs, base_subparser)\\n \\n archive_sub = _build_archive_subparser(subs, base_subparser)\\n rpc_sub = _build_rpc_subparser(subs, base_subparser)\\ndiff --git a/core/dbt/parser/base_sql.py b/core/dbt/parser/base_sql.py\\nindex 2a576ffaaf9..e359d2c67b7 100644\\n--- a/core/dbt/parser/base_sql.py\\n+++ b/core/dbt/parser/base_sql.py\\n@@ -47,9 +47,14 @@ def load_and_parse(self, package_name, root_dir, relative_dirs,\\n path = self.get_compiled_path(name,\\n file_match.get('relative_path'))\\n \\n+ # TODO(jeb): Why would the original file path rely on the compiled\\n+ # path?\\n+ # original_file_path = os.path.join(\\n+ # file_match.get('searched_path'),\\n+ # path)\\n original_file_path = os.path.join(\\n file_match.get('searched_path'),\\n- path)\\n+ file_match.get('relative_path'))\\n \\n result.append({\\n 'name': name,\\ndiff --git a/core/dbt/task/base.py b/core/dbt/task/base.py\\nindex 6a7a6b2be7e..3fb3e09feea 100644\\n--- a/core/dbt/task/base.py\\n+++ b/core/dbt/task/base.py\\n@@ -46,6 +46,10 @@ def __init__(self, args, config):\\n self.args = args\\n self.config = config\\n \\n+ @classmethod\\n+ def pre_init_hook(cls):\\n+ \\\"\\\"\\\"A hook called before the task is initialized.\\\"\\\"\\\"\\n+\\n @classmethod\\n def from_args(cls, args):\\n try:\\ndiff --git a/core/dbt/task/list.py b/core/dbt/task/list.py\\nnew file mode 100644\\nindex 00000000000..b4095b46c0b\\n--- /dev/null\\n+++ b/core/dbt/task/list.py\\n@@ -0,0 +1,120 @@\\n+from __future__ import print_function\\n+\\n+import json\\n+\\n+from dbt.task.runnable import GraphRunnableTask, ManifestTask\\n+from dbt.node_types import NodeType\\n+import dbt.exceptions\\n+from dbt.logger import GLOBAL_LOGGER as logger\\n+from dbt.logger import log_to_stderr\\n+\\n+\\n+class ListTask(GraphRunnableTask):\\n+ DEFAULT_RESOURCE_VALUES = frozenset((\\n+ NodeType.Model,\\n+ NodeType.Archive,\\n+ NodeType.Seed,\\n+ NodeType.Test,\\n+ NodeType.Source,\\n+ ))\\n+ ALL_RESOURCE_VALUES = DEFAULT_RESOURCE_VALUES | frozenset((\\n+ NodeType.Analysis,\\n+ ))\\n+ ALLOWED_KEYS = frozenset((\\n+ 'alias',\\n+ 'name',\\n+ 'package_name',\\n+ 'depends_on',\\n+ 'tags',\\n+ 'config',\\n+ 'resource_type',\\n+ 'source_name',\\n+ ))\\n+\\n+ def __init__(self, args, config):\\n+ super(ListTask, self).__init__(args, config)\\n+ self.config.args.single_threaded = True\\n+\\n+ @classmethod\\n+ def pre_init_hook(cls):\\n+ \\\"\\\"\\\"A hook called before the task is initialized.\\\"\\\"\\\"\\n+ log_to_stderr(logger)\\n+\\n+ def _iterate_selected_nodes(self):\\n+ nodes = sorted(self.select_nodes())\\n+ if not nodes:\\n+ logger.warning('No nodes selected!')\\n+ return\\n+ for node in nodes:\\n+ yield self.manifest.nodes[node]\\n+\\n+ def generate_selectors(self):\\n+ for node in self._iterate_selected_nodes():\\n+ if node.resource_type == NodeType.Source:\\n+ yield 'source:{}'.format(node.unique_id)\\n+ else:\\n+ yield node.unique_id\\n+\\n+ def generate_names(self):\\n+ for node in self._iterate_selected_nodes():\\n+ if node.resource_type == NodeType.Source:\\n+ yield '{0.source_name}.{0.name}'.format(node)\\n+ else:\\n+ yield node.name\\n+\\n+ def generate_json(self):\\n+ for node in self._iterate_selected_nodes():\\n+ yield json.dumps({\\n+ k: v\\n+ for k, v in node.serialize().items()\\n+ if k in self.ALLOWED_KEYS\\n+ })\\n+\\n+ def generate_paths(self):\\n+ for node in self._iterate_selected_nodes():\\n+ yield node.get('original_file_path')\\n+\\n+ def run(self):\\n+ ManifestTask._runtime_initialize(self)\\n+ output = self.config.args.output\\n+ if output == 'selector':\\n+ generator = self.generate_selectors\\n+ elif output == 'name':\\n+ generator = self.generate_names\\n+ elif output == 'json':\\n+ generator = self.generate_json\\n+ elif output == 'path':\\n+ generator = self.generate_paths\\n+ else:\\n+ raise dbt.exceptions.IternalException(\\n+ 'Invalid output {}'.format(output)\\n+ )\\n+ for result in generator():\\n+ self.node_results.append(result)\\n+ print(result)\\n+ return self.node_results\\n+\\n+ @property\\n+ def resource_types(self):\\n+ values = set(self.config.args.resource_types)\\n+ if not values:\\n+ return list(self.DEFAULT_RESOURCE_VALUES)\\n+\\n+ if 'default' in values:\\n+ values.remove('default')\\n+ values.update(self.DEFAULT_RESOURCE_VALUES)\\n+ if 'all' in values:\\n+ values.remove('all')\\n+ values.update(self.ALL_RESOURCE_VALUES)\\n+ return list(values)\\n+\\n+ def build_query(self):\\n+ return {\\n+ \\\"include\\\": self.args.models,\\n+ \\\"exclude\\\": self.args.exclude,\\n+ \\\"resource_types\\\": self.resource_types,\\n+ \\\"tags\\\": [],\\n+ }\\n+\\n+ def interpret_results(self, results):\\n+ return bool(results)\\ndiff --git a/test/integration/047_dbt_ls_test/analyses/analysis.sql b/test/integration/047_dbt_ls_test/analyses/analysis.sql\\nnew file mode 100644\\nindex 00000000000..1f7d87c55a9\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/analyses/analysis.sql\\n@@ -0,0 +1 @@\\n+select 4 as id\\ndiff --git a/test/integration/047_dbt_ls_test/archives/archive.sql b/test/integration/047_dbt_ls_test/archives/archive.sql\\nnew file mode 100644\\nindex 00000000000..c609604eec6\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/archives/archive.sql\\n@@ -0,0 +1,12 @@\\n+{% archive my_archive %}\\n+ {{\\n+ config(\\n+ target_database=var('target_database', database),\\n+ target_schema=schema,\\n+ unique_key='id',\\n+ strategy='timestamp',\\n+ updated_at='updated_at',\\n+ )\\n+ }}\\n+ select * from {{database}}.{{schema}}.seed\\n+{% endarchive %}\\ndiff --git a/test/integration/047_dbt_ls_test/data/seed.csv b/test/integration/047_dbt_ls_test/data/seed.csv\\nnew file mode 100644\\nindex 00000000000..cfa20f81071\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/data/seed.csv\\n@@ -0,0 +1,2 @@\\n+a,b\\n+1,2\\ndiff --git a/test/integration/047_dbt_ls_test/macros/macro_stuff.sql b/test/integration/047_dbt_ls_test/macros/macro_stuff.sql\\nnew file mode 100644\\nindex 00000000000..b05216d059a\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/macros/macro_stuff.sql\\n@@ -0,0 +1,7 @@\\n+{% macro cool_macro() %}\\n+\\twow!\\n+{% endmacro %}\\n+\\n+{% macro other_cool_macro(a, b) %}\\n+\\tcool!\\n+{% endmacro %}\\ndiff --git a/test/integration/047_dbt_ls_test/models/docs.md b/test/integration/047_dbt_ls_test/models/docs.md\\nnew file mode 100644\\nindex 00000000000..e658f3b11a9\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/models/docs.md\\n@@ -0,0 +1,3 @@\\n+{% docs my_docs %}\\n+\\tsome docs\\n+{% enddocs %}\\ndiff --git a/test/integration/047_dbt_ls_test/models/outer.sql b/test/integration/047_dbt_ls_test/models/outer.sql\\nnew file mode 100644\\nindex 00000000000..43258a71464\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/models/outer.sql\\n@@ -0,0 +1 @@\\n+select 1 as id\\ndiff --git a/test/integration/047_dbt_ls_test/models/schema.yml b/test/integration/047_dbt_ls_test/models/schema.yml\\nnew file mode 100644\\nindex 00000000000..8cfdf833aae\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/models/schema.yml\\n@@ -0,0 +1,15 @@\\n+version: 2\\n+models:\\n+ - name: outer\\n+ description: The outer table\\n+ columns:\\n+ - name: id\\n+ description: The id value\\n+ tests:\\n+ - unique\\n+ - not_null\\n+\\n+sources:\\n+ - name: my_source\\n+ tables:\\n+ - name: my_table\\ndiff --git a/test/integration/047_dbt_ls_test/models/sub/inner.sql b/test/integration/047_dbt_ls_test/models/sub/inner.sql\\nnew file mode 100644\\nindex 00000000000..a90004d480d\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/models/sub/inner.sql\\n@@ -0,0 +1 @@\\n+select * from {{ ref('outer') }}\\ndiff --git a/test/integration/047_dbt_ls_test/test_ls.py b/test/integration/047_dbt_ls_test/test_ls.py\\nnew file mode 100644\\nindex 00000000000..b31ed4688bd\\n--- /dev/null\\n+++ b/test/integration/047_dbt_ls_test/test_ls.py\\n@@ -0,0 +1,299 @@\\n+from test.integration.base import DBTIntegrationTest, use_profile\\n+from dbt.logger import log_to_stdout, GLOBAL_LOGGER\\n+\\n+import json\\n+import os\\n+\\n+\\n+class TestStrictUndefined(DBTIntegrationTest):\\n+\\n+ @property\\n+ def schema(self):\\n+ return 'dbt_ls_047'\\n+\\n+ @staticmethod\\n+ def dir(value):\\n+ return os.path.normpath('test/integration/047_dbt_ls_test/' + value)\\n+\\n+ @property\\n+ def models(self):\\n+ return self.dir('models')\\n+\\n+ @property\\n+ def project_config(self):\\n+ return {\\n+ 'analysis-paths': [self.dir('analyses')],\\n+ 'archive-paths': [self.dir('archives')],\\n+ 'macro-paths': [self.dir('macros')],\\n+ 'data-paths': [self.dir('data')],\\n+ }\\n+\\n+ def run_dbt_ls(self, args=None, expect_pass=True):\\n+ log_to_stdout(GLOBAL_LOGGER)\\n+ full_args = ['ls']\\n+ if args is not None:\\n+ full_args = full_args + args\\n+\\n+ result = self.run_dbt(args=full_args, expect_pass=expect_pass,\\n+ strict=False, parser=False)\\n+\\n+ log_to_stdout(GLOBAL_LOGGER)\\n+ return result\\n+\\n+ def assertEqualJSON(self, json_str, expected):\\n+ self.assertEqual(json.loads(json_str), expected)\\n+\\n+ def expect_given_output(self, args, expectations):\\n+ for key, values in expectations.items():\\n+ ls_result = self.run_dbt_ls(args + ['--output', key])\\n+ if not isinstance(values, (list, tuple)):\\n+ values = [values]\\n+ self.assertEqual(len(ls_result), len(values))\\n+ for got, expected in zip(ls_result, values):\\n+ if key == 'json':\\n+ self.assertEqualJSON(got, expected)\\n+ else:\\n+ self.assertEqual(got, expected)\\n+\\n+ def expect_archive_output(self):\\n+ expectations = {\\n+ 'name': 'my_archive',\\n+ 'selector': 'archive.test.my_archive',\\n+ 'json': {\\n+ 'name': 'my_archive',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': [], 'macros': []},\\n+ 'tags': [],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'archive',\\n+ 'post-hook': [],\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ 'target_database': self.default_database,\\n+ 'target_schema': self.unique_schema(),\\n+ 'unique_key': 'id',\\n+ 'strategy': 'timestamp',\\n+ 'updated_at': 'updated_at'\\n+ },\\n+ 'alias': 'my_archive',\\n+ 'resource_type': 'archive',\\n+ },\\n+ 'path': self.dir('archives/archive.sql'),\\n+ }\\n+ self.expect_given_output(['--resource-type', 'archive'], expectations)\\n+\\n+ def expect_analyses_output(self):\\n+ expectations = {\\n+ 'name': 'analysis',\\n+ 'selector': 'analysis.test.analysis',\\n+ 'json': {\\n+ 'name': 'analysis',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': [], 'macros': []},\\n+ 'tags': [],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'view',\\n+ 'post-hook': [],\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ },\\n+ 'alias': 'analysis',\\n+ 'resource_type': 'analysis',\\n+ },\\n+ 'path': self.dir('analyses/analysis.sql'),\\n+ }\\n+ self.expect_given_output(['--resource-type', 'analysis'], expectations)\\n+\\n+ def expect_model_output(self):\\n+ expectations = {\\n+ 'name': ('inner', 'outer'),\\n+ 'selector': ('model.test.inner', 'model.test.outer'),\\n+ 'json': (\\n+ {\\n+ 'name': 'inner',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': ['model.test.outer'], 'macros': []},\\n+ 'tags': [],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'view',\\n+ 'post-hook': [],\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ },\\n+ 'alias': 'inner',\\n+ 'resource_type': 'model',\\n+ },\\n+ {\\n+ 'name': 'outer',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': [], 'macros': []},\\n+ 'tags': [],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'view',\\n+ 'post-hook': [],\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ },\\n+ 'alias': 'outer',\\n+ 'resource_type': 'model',\\n+ },\\n+ ),\\n+ 'path': (self.dir('models/sub/inner.sql'), self.dir('models/outer.sql')),\\n+ }\\n+ self.expect_given_output(['--resource-type', 'model'], expectations)\\n+\\n+ def expect_source_output(self):\\n+ expectations = {\\n+ 'name': 'my_source.my_table',\\n+ 'selector': 'source:source.test.my_source.my_table',\\n+ 'json': {\\n+ 'package_name': 'test',\\n+ 'name': 'my_table',\\n+ 'source_name': 'my_source',\\n+ 'resource_type': 'source',\\n+ },\\n+ 'path': self.dir('models/schema.yml'),\\n+ }\\n+ # should we do this --select automatically for a user if if 'source' is\\n+ # in the resource types and there is no '--select' or '--exclude'?\\n+ self.expect_given_output(['--resource-type', 'source', '--select', 'source:*'], expectations)\\n+\\n+ def expect_seed_output(self):\\n+ expectations = {\\n+ 'name': 'seed',\\n+ 'selector': 'seed.test.seed',\\n+ 'json': {\\n+ 'name': 'seed',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': [], 'macros': []},\\n+ 'tags': [],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'seed',\\n+ 'post-hook': [],\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ },\\n+ 'alias': 'seed',\\n+ 'resource_type': 'seed',\\n+ },\\n+ 'path': self.dir('data/seed.csv'),\\n+ }\\n+ self.expect_given_output(['--resource-type', 'seed'], expectations)\\n+\\n+ def expect_test_output(self):\\n+ expectations = {\\n+ 'name': ('not_null_outer_id', 'unique_outer_id'),\\n+ 'selector': ('test.test.not_null_outer_id', 'test.test.unique_outer_id'),\\n+ 'json': (\\n+ {\\n+ 'name': 'not_null_outer_id',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': ['model.test.outer'], 'macros': []},\\n+ 'tags': ['schema'],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'view',\\n+ 'post-hook': [],\\n+ 'severity': 'ERROR',\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ },\\n+ 'alias': 'not_null_outer_id',\\n+ 'resource_type': 'test',\\n+\\n+ },\\n+ {\\n+ 'name': 'unique_outer_id',\\n+ 'package_name': 'test',\\n+ 'depends_on': {'nodes': ['model.test.outer'], 'macros': []},\\n+ 'tags': ['schema'],\\n+ 'config': {\\n+ 'enabled': True,\\n+ 'materialized': 'view',\\n+ 'post-hook': [],\\n+ 'severity': 'ERROR',\\n+ 'tags': [],\\n+ 'pre-hook': [],\\n+ 'quoting': {},\\n+ 'vars': {},\\n+ 'column_types': {},\\n+ },\\n+ 'alias': 'unique_outer_id',\\n+ 'resource_type': 'test',\\n+ },\\n+ ),\\n+ 'path': (self.dir('models/schema.yml'), self.dir('models/schema.yml')),\\n+ }\\n+ self.expect_given_output(['--resource-type', 'test'], expectations)\\n+\\n+ def expect_all_output(self):\\n+ expected_default = {\\n+ 'archive.test.my_archive',\\n+ 'model.test.inner',\\n+ 'model.test.outer',\\n+ 'seed.test.seed',\\n+ 'source:source.test.my_source.my_table',\\n+ 'test.test.not_null_outer_id',\\n+ 'test.test.unique_outer_id',\\n+ }\\n+ expected_all = expected_default | {'analysis.test.analysis'}\\n+\\n+ results = self.run_dbt_ls(['--resource-type', 'all', '--select', '*', 'source:*'])\\n+ self.assertEqual(set(results), expected_all)\\n+\\n+ results = self.run_dbt_ls(['--select', '*', 'source:*'])\\n+ self.assertEqual(set(results), expected_default)\\n+\\n+ results = self.run_dbt_ls(['--resource-type', 'default', '--select', '*', 'source:*'])\\n+ self.assertEqual(set(results), expected_default)\\n+\\n+ results = self.run_dbt_ls\\n+\\n+ def expect_select(self):\\n+ results = self.run_dbt_ls(['--resource-type', 'test', '--select', 'outer'])\\n+ self.assertEqual(set(results), {'test.test.not_null_outer_id', 'test.test.unique_outer_id'})\\n+\\n+ self.run_dbt_ls(['--resource-type', 'test', '--select', 'inner'], expect_pass=False)\\n+\\n+ results = self.run_dbt_ls(['--resource-type', 'test', '--select', '+inner'])\\n+ self.assertEqual(set(results), {'test.test.not_null_outer_id', 'test.test.unique_outer_id'})\\n+\\n+ results = self.run_dbt_ls(['--resource-type', 'model', '--select', 'outer+'])\\n+ self.assertEqual(set(results), {'model.test.outer', 'model.test.inner'})\\n+\\n+ results = self.run_dbt_ls(['--resource-type', 'model', '--exclude', 'inner'])\\n+ self.assertEqual(set(results), {'model.test.outer'})\\n+\\n+ @use_profile('postgres')\\n+ def test_postgres_ls(self):\\n+ self.expect_archive_output()\\n+ self.expect_analyses_output()\\n+ self.expect_model_output()\\n+ self.expect_source_output()\\n+ self.expect_seed_output()\\n+ self.expect_test_output()\\n+ self.expect_select()\\n+ self.expect_all_output()\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -569,6 +571,42 @@ def _build_rpc_subparser(subparsers, base_subparser):\n return sub\n \n \n+def _build_list_subparser(subparsers, base_subparser):\n+ sub = subparsers.add_parser(\n+ 'list',\n+ parents=[base_subparser],\n+ help='list models'\n+ )\n+ sub.set_defaults(cls=ListTask, which='list')\n+ resource_values = list(ListTask.ALL_RESOURCE_VALUES) + ['default', 'all']\n+ sub.add_argument('--resource-type',\n+ choices=resource_values,\n+ action='append',\n+ default=[],\n+ dest='resource_types')\n+ sub.add_argument('--output',\n+ choices=['json', 'name', 'path', 'selector'],\n+ default='selector')\n+ sub.add_argument(\n+ '-s',\n+ '--select',\n+ required=False,\n+ nargs='+',\n+ help=\"Specify the nodes to select.\",\n+ dest='models'","line":null,"original_line":596,"original_start_line":null,"path":"core/dbt/main.py","start_line":null,"text":"@user1:\ncan you change this to `selection` or `selector`? It renders as \r\n```\r\n-s MODELS [MODELS ...], --select MODELS [MODELS ...]\r\n```\r\n\r\nin `--help`"}],"string":"[\n {\n \"diff_hunk\": \"@@ -569,6 +571,42 @@ def _build_rpc_subparser(subparsers, base_subparser):\\n return sub\\n \\n \\n+def _build_list_subparser(subparsers, base_subparser):\\n+ sub = subparsers.add_parser(\\n+ 'list',\\n+ parents=[base_subparser],\\n+ help='list models'\\n+ )\\n+ sub.set_defaults(cls=ListTask, which='list')\\n+ resource_values = list(ListTask.ALL_RESOURCE_VALUES) + ['default', 'all']\\n+ sub.add_argument('--resource-type',\\n+ choices=resource_values,\\n+ action='append',\\n+ default=[],\\n+ dest='resource_types')\\n+ sub.add_argument('--output',\\n+ choices=['json', 'name', 'path', 'selector'],\\n+ default='selector')\\n+ sub.add_argument(\\n+ '-s',\\n+ '--select',\\n+ required=False,\\n+ nargs='+',\\n+ help=\\\"Specify the nodes to select.\\\",\\n+ dest='models'\",\n \"line\": null,\n \"original_line\": 596,\n \"original_start_line\": null,\n \"path\": \"core/dbt/main.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\ncan you change this to `selection` or `selector`? It renders as \\r\\n```\\r\\n-s MODELS [MODELS ...], --select MODELS [MODELS ...]\\r\\n```\\r\\n\\r\\nin `--help`\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"8e426e60c9b6d40425b805ebe2d10ce9d522a285"},"merged_patch":{"kind":"string","value":"diff --git a/core/dbt/logger.py b/core/dbt/logger.py\nindex f658769172f..7ec7426c619 100644\n--- a/core/dbt/logger.py\n+++ b/core/dbt/logger.py\n@@ -50,6 +50,11 @@ def notice(self, msg, *args, **kwargs):\n stdout_handler.setFormatter(logging.Formatter('%(message)s'))\n stdout_handler.setLevel(NOTICE)\n \n+stderr_handler = logging.StreamHandler(sys.stderr)\n+stderr_handler.setFormatter(logging.Formatter('%(message)s'))\n+stderr_handler.setLevel(WARNING)\n+\n+\n logger = logging.getLogger('dbt')\n logger.addHandler(stdout_handler)\n logger.setLevel(DEBUG)\n@@ -79,6 +84,21 @@ def notice(self, msg, *args, **kwargs):\n initialized = False\n \n \n+def _swap_handler(logger, old, new):\n+ if old in logger.handlers:\n+ logger.handlers.remove(old)\n+ if new not in logger.handlers:\n+ logger.addHandler(new)\n+\n+\n+def log_to_stderr(logger):\n+ _swap_handler(logger, stdout_handler, stderr_handler)\n+\n+\n+def log_to_stdout(logger):\n+ _swap_handler(logger, stderr_handler, stdout_handler)\n+\n+\n def make_log_dir_if_missing(log_dir):\n import dbt.clients.system\n dbt.clients.system.make_directory(log_dir)\n@@ -99,14 +119,17 @@ def default_formatter():\n \n \n def initialize_logger(debug_mode=False, path=None):\n- global initialized, logger, stdout_handler\n+ global initialized, logger, stdout_handler, stderr_handler\n \n if initialized:\n return\n \n if debug_mode:\n+ # we'll only use one of these, but just set both up\n stdout_handler.setFormatter(default_formatter())\n stdout_handler.setLevel(DEBUG)\n+ stderr_handler.setFormatter(default_formatter())\n+ stderr_handler.setLevel(DEBUG)\n \n if path is not None:\n make_log_dir_if_missing(path)\ndiff --git a/core/dbt/main.py b/core/dbt/main.py\nindex d7a869be6ef..18f1dacd9b6 100644\n--- a/core/dbt/main.py\n+++ b/core/dbt/main.py\n@@ -22,6 +22,7 @@\n import dbt.task.serve as serve_task\n import dbt.task.freshness as freshness_task\n import dbt.task.run_operation as run_operation_task\n+from dbt.task.list import ListTask\n from dbt.task.rpc_server import RPCServerTask\n from dbt.adapters.factory import reset_adapters\n \n@@ -92,8 +93,8 @@ def main(args=None):\n exit_code = e.code\n \n except BaseException as e:\n- logger.info(\"Encountered an error:\")\n- logger.info(str(e))\n+ logger.warn(\"Encountered an error:\")\n+ logger.warn(str(e))\n \n if logger_initialized():\n logger.debug(traceback.format_exc())\n@@ -183,6 +184,7 @@ def run_from_args(parsed):\n log_cache_events(getattr(parsed, 'log_cache_events', False))\n update_flags(parsed)\n \n+ parsed.cls.pre_init_hook()\n logger.info(\"Running with dbt{}\".format(dbt.version.installed))\n \n # this will convert DbtConfigErrors into RuntimeExceptions\n@@ -569,6 +571,53 @@ def _build_rpc_subparser(subparsers, base_subparser):\n return sub\n \n \n+def _build_list_subparser(subparsers, base_subparser):\n+ sub = subparsers.add_parser(\n+ 'list',\n+ parents=[base_subparser],\n+ help='list models'\n+ )\n+ sub.set_defaults(cls=ListTask, which='list')\n+ resource_values = list(ListTask.ALL_RESOURCE_VALUES) + ['default', 'all']\n+ sub.add_argument('--resource-type',\n+ choices=resource_values,\n+ action='append',\n+ default=[],\n+ dest='resource_types')\n+ sub.add_argument('--output',\n+ choices=['json', 'name', 'path', 'selector'],\n+ default='selector')\n+ sub.add_argument(\n+ '-s',\n+ '--select',\n+ required=False,\n+ nargs='+',\n+ metavar='SELECTOR',\n+ help=\"Specify the nodes to select.\",\n+ )\n+ sub.add_argument(\n+ '-m',\n+ '--models',\n+ required=False,\n+ nargs='+',\n+ metavar='SELECTOR',\n+ help=\"Specify the models to select and set the resource-type to \"\n+ \"'model'. Mutually exclusive with '--select' (or '-s') and \"\n+ \"'--resource-type'\",\n+ )\n+ sub.add_argument(\n+ '--exclude',\n+ required=False,\n+ nargs='+',\n+ metavar='SELECTOR',\n+ help=\"Specify the models to exclude.\"\n+ )\n+ # in python 3.x you can use the 'aliases' kwarg, but in python 2.7 you get\n+ # to do this\n+ subparsers._name_parser_map['ls'] = sub\n+ return sub\n+\n+\n def parse_args(args):\n p = DBTArgumentParser(\n prog='dbt: data build tool',\n@@ -645,14 +694,15 @@ def parse_args(args):\n \n # make the subcommands that have their own subcommands\n docs_sub = _build_docs_subparser(subs, base_subparser)\n- docs_subs = docs_sub.add_subparsers()\n+ docs_subs = docs_sub.add_subparsers(title=\"Available sub-commands\")\n source_sub = _build_source_subparser(subs, base_subparser)\n- source_subs = source_sub.add_subparsers()\n+ source_subs = source_sub.add_subparsers(title=\"Available sub-commands\")\n \n _build_init_subparser(subs, base_subparser)\n _build_clean_subparser(subs, base_subparser)\n _build_debug_subparser(subs, base_subparser)\n _build_deps_subparser(subs, base_subparser)\n+ _build_list_subparser(subs, base_subparser)\n \n archive_sub = _build_archive_subparser(subs, base_subparser)\n rpc_sub = _build_rpc_subparser(subs, base_subparser)\ndiff --git a/core/dbt/parser/base_sql.py b/core/dbt/parser/base_sql.py\nindex 2a576ffaaf9..99a280758a0 100644\n--- a/core/dbt/parser/base_sql.py\n+++ b/core/dbt/parser/base_sql.py\n@@ -49,7 +49,7 @@ def load_and_parse(self, package_name, root_dir, relative_dirs,\n \n original_file_path = os.path.join(\n file_match.get('searched_path'),\n- path)\n+ file_match.get('relative_path'))\n \n result.append({\n 'name': name,\ndiff --git a/core/dbt/task/base.py b/core/dbt/task/base.py\nindex 6a7a6b2be7e..3fb3e09feea 100644\n--- a/core/dbt/task/base.py\n+++ b/core/dbt/task/base.py\n@@ -46,6 +46,10 @@ def __init__(self, args, config):\n self.args = args\n self.config = config\n \n+ @classmethod\n+ def pre_init_hook(cls):\n+ \"\"\"A hook called before the task is initialized.\"\"\"\n+\n @classmethod\n def from_args(cls, args):\n try:\ndiff --git a/core/dbt/task/list.py b/core/dbt/task/list.py\nnew file mode 100644\nindex 00000000000..55204454268\n--- /dev/null\n+++ b/core/dbt/task/list.py\n@@ -0,0 +1,140 @@\n+from __future__ import print_function\n+\n+import json\n+\n+from dbt.task.runnable import GraphRunnableTask, ManifestTask\n+from dbt.node_types import NodeType\n+import dbt.exceptions\n+from dbt.logger import GLOBAL_LOGGER as logger\n+from dbt.logger import log_to_stderr\n+\n+\n+class ListTask(GraphRunnableTask):\n+ DEFAULT_RESOURCE_VALUES = frozenset((\n+ NodeType.Model,\n+ NodeType.Archive,\n+ NodeType.Seed,\n+ NodeType.Test,\n+ NodeType.Source,\n+ ))\n+ ALL_RESOURCE_VALUES = DEFAULT_RESOURCE_VALUES | frozenset((\n+ NodeType.Analysis,\n+ ))\n+ ALLOWED_KEYS = frozenset((\n+ 'alias',\n+ 'name',\n+ 'package_name',\n+ 'depends_on',\n+ 'tags',\n+ 'config',\n+ 'resource_type',\n+ 'source_name',\n+ ))\n+\n+ def __init__(self, args, config):\n+ super(ListTask, self).__init__(args, config)\n+ self.args.single_threaded = True\n+ if self.args.models:\n+ if self.args.select:\n+ raise dbt.exceptions.RuntimeException(\n+ '\"models\" and \"select\" are mutually exclusive arguments'\n+ )\n+ if self.args.resource_types:\n+ raise dbt.exceptions.RuntimeException(\n+ '\"models\" and \"resource_type\" are mutually exclusive '\n+ 'arguments'\n+ )\n+\n+ @classmethod\n+ def pre_init_hook(cls):\n+ \"\"\"A hook called before the task is initialized.\"\"\"\n+ log_to_stderr(logger)\n+\n+ def _iterate_selected_nodes(self):\n+ nodes = sorted(self.select_nodes())\n+ if not nodes:\n+ logger.warning('No nodes selected!')\n+ return\n+ for node in nodes:\n+ yield self.manifest.nodes[node]\n+\n+ def generate_selectors(self):\n+ for node in self._iterate_selected_nodes():\n+ if node.resource_type == NodeType.Source:\n+ yield 'source:{}'.format(node.unique_id)\n+ else:\n+ yield node.unique_id\n+\n+ def generate_names(self):\n+ for node in self._iterate_selected_nodes():\n+ if node.resource_type == NodeType.Source:\n+ yield '{0.source_name}.{0.name}'.format(node)\n+ else:\n+ yield node.name\n+\n+ def generate_json(self):\n+ for node in self._iterate_selected_nodes():\n+ yield json.dumps({\n+ k: v\n+ for k, v in node.serialize().items()\n+ if k in self.ALLOWED_KEYS\n+ })\n+\n+ def generate_paths(self):\n+ for node in self._iterate_selected_nodes():\n+ yield node.get('original_file_path')\n+\n+ def run(self):\n+ ManifestTask._runtime_initialize(self)\n+ output = self.config.args.output\n+ if output == 'selector':\n+ generator = self.generate_selectors\n+ elif output == 'name':\n+ generator = self.generate_names\n+ elif output == 'json':\n+ generator = self.generate_json\n+ elif output == 'path':\n+ generator = self.generate_paths\n+ else:\n+ raise dbt.exceptions.IternalException(\n+ 'Invalid output {}'.format(output)\n+ )\n+ for result in generator():\n+ self.node_results.append(result)\n+ print(result)\n+ return self.node_results\n+\n+ @property\n+ def resource_types(self):\n+ if self.args.models:\n+ return [NodeType.Model]\n+\n+ values = set(self.config.args.resource_types)\n+ if not values:\n+ return list(self.DEFAULT_RESOURCE_VALUES)\n+\n+ if 'default' in values:\n+ values.remove('default')\n+ values.update(self.DEFAULT_RESOURCE_VALUES)\n+ if 'all' in values:\n+ values.remove('all')\n+ values.update(self.ALL_RESOURCE_VALUES)\n+ return list(values)\n+\n+ @property\n+ def selector(self):\n+ if self.args.models:\n+ return self.args.models\n+ else:\n+ return self.args.select\n+\n+ def build_query(self):\n+ return {\n+ \"include\": self.selector,\n+ \"exclude\": self.args.exclude,\n+ \"resource_types\": self.resource_types,\n+ \"tags\": [],\n+ }\n+\n+ def interpret_results(self, results):\n+ return bool(results)\ndiff --git a/test/integration/047_dbt_ls_test/analyses/analysis.sql b/test/integration/047_dbt_ls_test/analyses/analysis.sql\nnew file mode 100644\nindex 00000000000..1f7d87c55a9\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/analyses/analysis.sql\n@@ -0,0 +1 @@\n+select 4 as id\ndiff --git a/test/integration/047_dbt_ls_test/archives/archive.sql b/test/integration/047_dbt_ls_test/archives/archive.sql\nnew file mode 100644\nindex 00000000000..c609604eec6\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/archives/archive.sql\n@@ -0,0 +1,12 @@\n+{% archive my_archive %}\n+ {{\n+ config(\n+ target_database=var('target_database', database),\n+ target_schema=schema,\n+ unique_key='id',\n+ strategy='timestamp',\n+ updated_at='updated_at',\n+ )\n+ }}\n+ select * from {{database}}.{{schema}}.seed\n+{% endarchive %}\ndiff --git a/test/integration/047_dbt_ls_test/data/seed.csv b/test/integration/047_dbt_ls_test/data/seed.csv\nnew file mode 100644\nindex 00000000000..cfa20f81071\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/data/seed.csv\n@@ -0,0 +1,2 @@\n+a,b\n+1,2\ndiff --git a/test/integration/047_dbt_ls_test/macros/macro_stuff.sql b/test/integration/047_dbt_ls_test/macros/macro_stuff.sql\nnew file mode 100644\nindex 00000000000..b05216d059a\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/macros/macro_stuff.sql\n@@ -0,0 +1,7 @@\n+{% macro cool_macro() %}\n+\twow!\n+{% endmacro %}\n+\n+{% macro other_cool_macro(a, b) %}\n+\tcool!\n+{% endmacro %}\ndiff --git a/test/integration/047_dbt_ls_test/models/docs.md b/test/integration/047_dbt_ls_test/models/docs.md\nnew file mode 100644\nindex 00000000000..e658f3b11a9\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/models/docs.md\n@@ -0,0 +1,3 @@\n+{% docs my_docs %}\n+\tsome docs\n+{% enddocs %}\ndiff --git a/test/integration/047_dbt_ls_test/models/outer.sql b/test/integration/047_dbt_ls_test/models/outer.sql\nnew file mode 100644\nindex 00000000000..43258a71464\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/models/outer.sql\n@@ -0,0 +1 @@\n+select 1 as id\ndiff --git a/test/integration/047_dbt_ls_test/models/schema.yml b/test/integration/047_dbt_ls_test/models/schema.yml\nnew file mode 100644\nindex 00000000000..8cfdf833aae\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/models/schema.yml\n@@ -0,0 +1,15 @@\n+version: 2\n+models:\n+ - name: outer\n+ description: The outer table\n+ columns:\n+ - name: id\n+ description: The id value\n+ tests:\n+ - unique\n+ - not_null\n+\n+sources:\n+ - name: my_source\n+ tables:\n+ - name: my_table\ndiff --git a/test/integration/047_dbt_ls_test/models/sub/inner.sql b/test/integration/047_dbt_ls_test/models/sub/inner.sql\nnew file mode 100644\nindex 00000000000..a90004d480d\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/models/sub/inner.sql\n@@ -0,0 +1 @@\n+select * from {{ ref('outer') }}\ndiff --git a/test/integration/047_dbt_ls_test/test_ls.py b/test/integration/047_dbt_ls_test/test_ls.py\nnew file mode 100644\nindex 00000000000..b31ed4688bd\n--- /dev/null\n+++ b/test/integration/047_dbt_ls_test/test_ls.py\n@@ -0,0 +1,299 @@\n+from test.integration.base import DBTIntegrationTest, use_profile\n+from dbt.logger import log_to_stdout, GLOBAL_LOGGER\n+\n+import json\n+import os\n+\n+\n+class TestStrictUndefined(DBTIntegrationTest):\n+\n+ @property\n+ def schema(self):\n+ return 'dbt_ls_047'\n+\n+ @staticmethod\n+ def dir(value):\n+ return os.path.normpath('test/integration/047_dbt_ls_test/' + value)\n+\n+ @property\n+ def models(self):\n+ return self.dir('models')\n+\n+ @property\n+ def project_config(self):\n+ return {\n+ 'analysis-paths': [self.dir('analyses')],\n+ 'archive-paths': [self.dir('archives')],\n+ 'macro-paths': [self.dir('macros')],\n+ 'data-paths': [self.dir('data')],\n+ }\n+\n+ def run_dbt_ls(self, args=None, expect_pass=True):\n+ log_to_stdout(GLOBAL_LOGGER)\n+ full_args = ['ls']\n+ if args is not None:\n+ full_args = full_args + args\n+\n+ result = self.run_dbt(args=full_args, expect_pass=expect_pass,\n+ strict=False, parser=False)\n+\n+ log_to_stdout(GLOBAL_LOGGER)\n+ return result\n+\n+ def assertEqualJSON(self, json_str, expected):\n+ self.assertEqual(json.loads(json_str), expected)\n+\n+ def expect_given_output(self, args, expectations):\n+ for key, values in expectations.items():\n+ ls_result = self.run_dbt_ls(args + ['--output', key])\n+ if not isinstance(values, (list, tuple)):\n+ values = [values]\n+ self.assertEqual(len(ls_result), len(values))\n+ for got, expected in zip(ls_result, values):\n+ if key == 'json':\n+ self.assertEqualJSON(got, expected)\n+ else:\n+ self.assertEqual(got, expected)\n+\n+ def expect_archive_output(self):\n+ expectations = {\n+ 'name': 'my_archive',\n+ 'selector': 'archive.test.my_archive',\n+ 'json': {\n+ 'name': 'my_archive',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': [], 'macros': []},\n+ 'tags': [],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'archive',\n+ 'post-hook': [],\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ 'target_database': self.default_database,\n+ 'target_schema': self.unique_schema(),\n+ 'unique_key': 'id',\n+ 'strategy': 'timestamp',\n+ 'updated_at': 'updated_at'\n+ },\n+ 'alias': 'my_archive',\n+ 'resource_type': 'archive',\n+ },\n+ 'path': self.dir('archives/archive.sql'),\n+ }\n+ self.expect_given_output(['--resource-type', 'archive'], expectations)\n+\n+ def expect_analyses_output(self):\n+ expectations = {\n+ 'name': 'analysis',\n+ 'selector': 'analysis.test.analysis',\n+ 'json': {\n+ 'name': 'analysis',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': [], 'macros': []},\n+ 'tags': [],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'view',\n+ 'post-hook': [],\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ },\n+ 'alias': 'analysis',\n+ 'resource_type': 'analysis',\n+ },\n+ 'path': self.dir('analyses/analysis.sql'),\n+ }\n+ self.expect_given_output(['--resource-type', 'analysis'], expectations)\n+\n+ def expect_model_output(self):\n+ expectations = {\n+ 'name': ('inner', 'outer'),\n+ 'selector': ('model.test.inner', 'model.test.outer'),\n+ 'json': (\n+ {\n+ 'name': 'inner',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': ['model.test.outer'], 'macros': []},\n+ 'tags': [],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'view',\n+ 'post-hook': [],\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ },\n+ 'alias': 'inner',\n+ 'resource_type': 'model',\n+ },\n+ {\n+ 'name': 'outer',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': [], 'macros': []},\n+ 'tags': [],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'view',\n+ 'post-hook': [],\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ },\n+ 'alias': 'outer',\n+ 'resource_type': 'model',\n+ },\n+ ),\n+ 'path': (self.dir('models/sub/inner.sql'), self.dir('models/outer.sql')),\n+ }\n+ self.expect_given_output(['--resource-type', 'model'], expectations)\n+\n+ def expect_source_output(self):\n+ expectations = {\n+ 'name': 'my_source.my_table',\n+ 'selector': 'source:source.test.my_source.my_table',\n+ 'json': {\n+ 'package_name': 'test',\n+ 'name': 'my_table',\n+ 'source_name': 'my_source',\n+ 'resource_type': 'source',\n+ },\n+ 'path': self.dir('models/schema.yml'),\n+ }\n+ # should we do this --select automatically for a user if if 'source' is\n+ # in the resource types and there is no '--select' or '--exclude'?\n+ self.expect_given_output(['--resource-type', 'source', '--select', 'source:*'], expectations)\n+\n+ def expect_seed_output(self):\n+ expectations = {\n+ 'name': 'seed',\n+ 'selector': 'seed.test.seed',\n+ 'json': {\n+ 'name': 'seed',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': [], 'macros': []},\n+ 'tags': [],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'seed',\n+ 'post-hook': [],\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ },\n+ 'alias': 'seed',\n+ 'resource_type': 'seed',\n+ },\n+ 'path': self.dir('data/seed.csv'),\n+ }\n+ self.expect_given_output(['--resource-type', 'seed'], expectations)\n+\n+ def expect_test_output(self):\n+ expectations = {\n+ 'name': ('not_null_outer_id', 'unique_outer_id'),\n+ 'selector': ('test.test.not_null_outer_id', 'test.test.unique_outer_id'),\n+ 'json': (\n+ {\n+ 'name': 'not_null_outer_id',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': ['model.test.outer'], 'macros': []},\n+ 'tags': ['schema'],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'view',\n+ 'post-hook': [],\n+ 'severity': 'ERROR',\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ },\n+ 'alias': 'not_null_outer_id',\n+ 'resource_type': 'test',\n+\n+ },\n+ {\n+ 'name': 'unique_outer_id',\n+ 'package_name': 'test',\n+ 'depends_on': {'nodes': ['model.test.outer'], 'macros': []},\n+ 'tags': ['schema'],\n+ 'config': {\n+ 'enabled': True,\n+ 'materialized': 'view',\n+ 'post-hook': [],\n+ 'severity': 'ERROR',\n+ 'tags': [],\n+ 'pre-hook': [],\n+ 'quoting': {},\n+ 'vars': {},\n+ 'column_types': {},\n+ },\n+ 'alias': 'unique_outer_id',\n+ 'resource_type': 'test',\n+ },\n+ ),\n+ 'path': (self.dir('models/schema.yml'), self.dir('models/schema.yml')),\n+ }\n+ self.expect_given_output(['--resource-type', 'test'], expectations)\n+\n+ def expect_all_output(self):\n+ expected_default = {\n+ 'archive.test.my_archive',\n+ 'model.test.inner',\n+ 'model.test.outer',\n+ 'seed.test.seed',\n+ 'source:source.test.my_source.my_table',\n+ 'test.test.not_null_outer_id',\n+ 'test.test.unique_outer_id',\n+ }\n+ expected_all = expected_default | {'analysis.test.analysis'}\n+\n+ results = self.run_dbt_ls(['--resource-type', 'all', '--select', '*', 'source:*'])\n+ self.assertEqual(set(results), expected_all)\n+\n+ results = self.run_dbt_ls(['--select', '*', 'source:*'])\n+ self.assertEqual(set(results), expected_default)\n+\n+ results = self.run_dbt_ls(['--resource-type', 'default', '--select', '*', 'source:*'])\n+ self.assertEqual(set(results), expected_default)\n+\n+ results = self.run_dbt_ls\n+\n+ def expect_select(self):\n+ results = self.run_dbt_ls(['--resource-type', 'test', '--select', 'outer'])\n+ self.assertEqual(set(results), {'test.test.not_null_outer_id', 'test.test.unique_outer_id'})\n+\n+ self.run_dbt_ls(['--resource-type', 'test', '--select', 'inner'], expect_pass=False)\n+\n+ results = self.run_dbt_ls(['--resource-type', 'test', '--select', '+inner'])\n+ self.assertEqual(set(results), {'test.test.not_null_outer_id', 'test.test.unique_outer_id'})\n+\n+ results = self.run_dbt_ls(['--resource-type', 'model', '--select', 'outer+'])\n+ self.assertEqual(set(results), {'model.test.outer', 'model.test.inner'})\n+\n+ results = self.run_dbt_ls(['--resource-type', 'model', '--exclude', 'inner'])\n+ self.assertEqual(set(results), {'model.test.outer'})\n+\n+ @use_profile('postgres')\n+ def test_postgres_ls(self):\n+ self.expect_archive_output()\n+ self.expect_analyses_output()\n+ self.expect_model_output()\n+ self.expect_source_output()\n+ self.expect_seed_output()\n+ self.expect_test_output()\n+ self.expect_select()\n+ self.expect_all_output()\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 4,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2378,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-1440@ec8277b"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":1440,"string":"1,440"},"title":{"kind":"string","value":"Output run hooks (#696)"},"body":{"kind":"string","value":"Fixes #696 \r\n\r\nOutput information about the on-run-start and on-run-end hooks before and after running dbt.\r\n\r\nOne wrinkle, the output isn't exactly as described in the issue - it's a bit tricky to move that `Concurrency` line before hooks run. Instead you get this order.\r\n\r\n```\r\nRunning with dbt=0.13.0\r\nFound 163 macros, 0 analyses, 0 archives, 0 sources, 0 seed files, 0 tests, 2 operations, 1 models\r\n\r\n07:58:48 |\r\n07:58:48 | Running 1 on-run-start hook\r\n07:58:48 | 1 of 1 START select * from information_schema.schemata\r\n07:58:48 |\r\n07:58:48 | Concurrency: 2 threads (target='default')\r\n07:58:48 |\r\n07:58:48 | 1 of 1 START view model dbt_postgres.x............................... [RUN]\r\n07:58:48 | 1 of 1 OK created view model dbt_postgres.x.......................... [CREATE VIEW in 0.08s]\r\n07:58:48 |\r\n07:58:48 | Running 1 on-run-end hook\r\n07:58:48 | 1 of 1 START select * from information_schema.schemata\r\n07:58:48 |\r\n07:58:48 |\r\n07:58:48 | Finished running 2 hooks, 1 view models in 0.45s.\r\n\r\nCompleted successfully\r\n\r\nDone. PASS=1 ERROR=0 SKIP=0 TOTAL=1\r\n```\r\n\r\nWe definitely can move that `Concurrency` line up, and the output would probably look a bit nicer, but it involves moving that into the task level instead of the node runner level and rearranging some things."},"created_at":{"kind":"string","value":"2019-05-03T15:08:33Z"},"problem_statement":{"kind":"string","value":"show on-run-start/end + hooks in dbt output\n### Feature\r\n\r\ndbt doesn't output any info about the start/end hooks that it runs, so it can be hard to understand why the stdout seems to stall. Instead, dbt should log the start/end hooks that it is running to the console.\r\n\r\nExample:\r\n```\r\n$ dbt run\r\n\r\nFound 3 models, 2 tests, 0 archives, 0 analyses, 96 macros, 2 operations, 0 seed files\r\n\r\n12:27:16 | Concurrency: 8 threads (target='dev')\r\n12:27:16 |\r\n12:27:16 | Running 3 on-run-start hooks:\r\n12:27:16 | 1 of 3 START grant usage on ...\r\n12:27:16 | 2 of 3 START grant create on ...\r\n12:27:16 | 3 of 3 START insert into public._audit ...\r\n12:27:16 |\r\n12:27:16 | Running 2 models:\r\n12:27:16 | 1 of 2 START table model demo_schema.dep............................. [RUN]\r\n12:27:16 | 2 of 2 START incremental model demo_schema.local..................... [RUN]\r\n12:27:16 | 1 of 2 OK created table model demo_schema.dep........................ [SELECT 1 in 0.13s]\r\n12:27:16 | 2 of 2 OK created incremental model demo_schema.local................ [INSERT 0 1 in 0.14s]\r\n12:27:16 |\r\n12:27:16 | Running 3 on-run-end hooks:\r\n12:27:16 | 1 of 3 START grant usage on ...\r\n12:27:16 | 2 of 3 START grant create on ...\r\n12:27:16 | 3 of 3 START insert into public._audit ...\r\n12:27:16 |\r\n12:27:16 | Finished running 1 table models, 1 incremental models, 6 run hooks in 0.32s.\r\n\r\nCompleted successfully\r\n\r\nDone. PASS=2 ERROR=0 SKIP=0 TOTAL=2\r\n```\r\n\r\nIf there are no on-run-start/end hooks, dbt should skip those sections of the info logs. Note that we should also add something like `6 run hooks` to the final line of model run logs.\r\n\r\n^ this is an initial idea of how this could look, but I don't know that I _love_ it. Very open to other ideas!"},"hints_text":{"kind":"string","value":"I'd like to take a stab at this.\nCool @vijaykiran! Let me know if there's anything I can do to help out when you give it a shot :) \nThis looks good"},"resolved_issues":{"kind":"list like","value":[{"body":"### Feature\r\n\r\ndbt doesn't output any info about the start/end hooks that it runs, so it can be hard to understand why the stdout seems to stall. Instead, dbt should log the start/end hooks that it is running to the console.\r\n\r\nExample:\r\n```\r\n$ dbt run\r\n\r\nFound 3 models, 2 tests, 0 archives, 0 analyses, 96 macros, 2 operations, 0 seed files\r\n\r\n12:27:16 | Concurrency: 8 threads (target='dev')\r\n12:27:16 |\r\n12:27:16 | Running 3 on-run-start hooks:\r\n12:27:16 | 1 of 3 START grant usage on ...\r\n12:27:16 | 2 of 3 START grant create on ...\r\n12:27:16 | 3 of 3 START insert into public._audit ...\r\n12:27:16 |\r\n12:27:16 | Running 2 models:\r\n12:27:16 | 1 of 2 START table model demo_schema.dep............................. [RUN]\r\n12:27:16 | 2 of 2 START incremental model demo_schema.local..................... [RUN]\r\n12:27:16 | 1 of 2 OK created table model demo_schema.dep........................ [SELECT 1 in 0.13s]\r\n12:27:16 | 2 of 2 OK created incremental model demo_schema.local................ [INSERT 0 1 in 0.14s]\r\n12:27:16 |\r\n12:27:16 | Running 3 on-run-end hooks:\r\n12:27:16 | 1 of 3 START grant usage on ...\r\n12:27:16 | 2 of 3 START grant create on ...\r\n12:27:16 | 3 of 3 START insert into public._audit ...\r\n12:27:16 |\r\n12:27:16 | Finished running 1 table models, 1 incremental models, 6 run hooks in 0.32s.\r\n\r\nCompleted successfully\r\n\r\nDone. PASS=2 ERROR=0 SKIP=0 TOTAL=2\r\n```\r\n\r\nIf there are no on-run-start/end hooks, dbt should skip those sections of the info logs. Note that we should also add something like `6 run hooks` to the final line of model run logs.\r\n\r\n^ this is an initial idea of how this could look, but I don't know that I _love_ it. Very open to other ideas!","number":696,"title":"show on-run-start/end + hooks in dbt output"}],"string":"[\n {\n \"body\": \"### Feature\\r\\n\\r\\ndbt doesn't output any info about the start/end hooks that it runs, so it can be hard to understand why the stdout seems to stall. Instead, dbt should log the start/end hooks that it is running to the console.\\r\\n\\r\\nExample:\\r\\n```\\r\\n$ dbt run\\r\\n\\r\\nFound 3 models, 2 tests, 0 archives, 0 analyses, 96 macros, 2 operations, 0 seed files\\r\\n\\r\\n12:27:16 | Concurrency: 8 threads (target='dev')\\r\\n12:27:16 |\\r\\n12:27:16 | Running 3 on-run-start hooks:\\r\\n12:27:16 | 1 of 3 START grant usage on ...\\r\\n12:27:16 | 2 of 3 START grant create on ...\\r\\n12:27:16 | 3 of 3 START insert into public._audit ...\\r\\n12:27:16 |\\r\\n12:27:16 | Running 2 models:\\r\\n12:27:16 | 1 of 2 START table model demo_schema.dep............................. [RUN]\\r\\n12:27:16 | 2 of 2 START incremental model demo_schema.local..................... [RUN]\\r\\n12:27:16 | 1 of 2 OK created table model demo_schema.dep........................ [SELECT 1 in 0.13s]\\r\\n12:27:16 | 2 of 2 OK created incremental model demo_schema.local................ [INSERT 0 1 in 0.14s]\\r\\n12:27:16 |\\r\\n12:27:16 | Running 3 on-run-end hooks:\\r\\n12:27:16 | 1 of 3 START grant usage on ...\\r\\n12:27:16 | 2 of 3 START grant create on ...\\r\\n12:27:16 | 3 of 3 START insert into public._audit ...\\r\\n12:27:16 |\\r\\n12:27:16 | Finished running 1 table models, 1 incremental models, 6 run hooks in 0.32s.\\r\\n\\r\\nCompleted successfully\\r\\n\\r\\nDone. PASS=2 ERROR=0 SKIP=0 TOTAL=2\\r\\n```\\r\\n\\r\\nIf there are no on-run-start/end hooks, dbt should skip those sections of the info logs. Note that we should also add something like `6 run hooks` to the final line of model run logs.\\r\\n\\r\\n^ this is an initial idea of how this could look, but I don't know that I _love_ it. Very open to other ideas!\",\n \"number\": 696,\n \"title\": \"show on-run-start/end + hooks in dbt output\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"3c8bbddb5f03f4009722ce83568b936652926bd2"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"ec8277b0e46654d6db18f99e26157af1440ac1e9\",\n \"head_commit_message\": \"add color to hooks, give hooks names\",\n \"patch_to_review\": \"diff --git a/core/dbt/logger.py b/core/dbt/logger.py\\nindex f658769172f..9840d8c8fc8 100644\\n--- a/core/dbt/logger.py\\n+++ b/core/dbt/logger.py\\n@@ -67,6 +67,10 @@ def notice(self, msg, *args, **kwargs):\\n \\n # provide this for the cache.\\n CACHE_LOGGER = logging.getLogger('dbt.cache')\\n+# add a dummy handler to avoid `No handlers could be found for logger`\\n+nothing_handler = logging.StreamHandler()\\n+nothing_handler.setLevel(CRITICAL)\\n+CACHE_LOGGER.addHandler(nothing_handler)\\n # provide this for RPC connection logging\\n RPC_LOGGER = logging.getLogger('dbt.rpc')\\n \\ndiff --git a/core/dbt/task/run.py b/core/dbt/task/run.py\\nindex 3e7903a3736..fceebe1aa85 100644\\n--- a/core/dbt/task/run.py\\n+++ b/core/dbt/task/run.py\\n@@ -1,27 +1,67 @@\\n from __future__ import print_function\\n \\n+import time\\n+\\n from dbt.logger import GLOBAL_LOGGER as logger\\n from dbt.node_types import NodeType, RunHookType\\n from dbt.node_runners import ModelRunner, RPCExecuteRunner\\n \\n import dbt.exceptions\\n import dbt.flags\\n-import dbt.ui.printer\\n from dbt.contracts.graph.parsed import Hook\\n from dbt.hooks import get_hook_dict\\n+from dbt.ui.printer import \\\\\\n+ print_hook_start_line, \\\\\\n+ print_hook_end_line, \\\\\\n+ print_timestamped_line, \\\\\\n+ print_run_end_messages, \\\\\\n+ get_counts\\n \\n from dbt.compilation import compile_node\\n from dbt.task.compile import CompileTask, RemoteCompileTask\\n from dbt.utils import get_nodes_by_tags\\n \\n \\n+class Timer(object):\\n+ def __init__(self):\\n+ self.start = None\\n+ self.end = None\\n+\\n+ @property\\n+ def elapsed(self):\\n+ if self.start is None or self.end is None:\\n+ return None\\n+ return self.end - self.start\\n+\\n+ def __enter__(self):\\n+ self.start = time.time()\\n+ return self\\n+\\n+ def __exit__(self, exc_type, exc_value, exc_tracebck):\\n+ self.end = time.time()\\n+\\n+\\n class RunTask(CompileTask):\\n+ def __init__(self, args, config):\\n+ super(RunTask, self).__init__(args, config)\\n+ self.ran_hooks = []\\n+\\n def raise_on_first_error(self):\\n return False\\n \\n def populate_adapter_cache(self, adapter):\\n adapter.set_relations_cache(self.manifest)\\n \\n+ def get_hook_sql(self, adapter, hook, idx, num_hooks, extra_context):\\n+ compiled = compile_node(adapter, self.config, hook, self.manifest,\\n+ extra_context)\\n+ statement = compiled.wrapped_sql\\n+ hook_index = hook.get('index', num_hooks)\\n+ hook_dict = get_hook_dict(statement, index=hook_index)\\n+ if dbt.flags.STRICT_MODE:\\n+ Hook(**hook_dict)\\n+ return hook_dict.get('sql', '')\\n+\\n def run_hooks(self, adapter, hook_type, extra_context):\\n \\n nodes = self.manifest.nodes.values()\\n@@ -33,22 +73,35 @@ def run_hooks(self, adapter, hook_type, extra_context):\\n # b/c psycopg2 automatically begins a transaction when a connection\\n # is created.\\n adapter.clear_transaction()\\n+ if not ordered_hooks:\\n+ return\\n+ num_hooks = len(ordered_hooks)\\n+\\n+ plural = 'hook' if num_hooks == 1 else 'hooks'\\n+ print_timestamped_line(\\\"\\\")\\n+ print_timestamped_line(\\n+ 'Running {} {} {}'.format(num_hooks, hook_type, plural)\\n+ )\\n \\n- for i, hook in enumerate(ordered_hooks):\\n- compiled = compile_node(adapter, self.config, hook,\\n- self.manifest, extra_context)\\n- statement = compiled.wrapped_sql\\n+ for idx, hook in enumerate(ordered_hooks, start=1):\\n+ sql = self.get_hook_sql(adapter, hook, idx, num_hooks,\\n+ extra_context)\\n \\n- hook_index = hook.get('index', len(hooks))\\n- hook_dict = get_hook_dict(statement, index=hook_index)\\n+ # convert all whitespace sequences to single spaces\\n+ hook_text = ' '.join(sql.split())\\n+ hook_text = '{}.{}.{}'.format(hook.package_name, hook_type, idx)\\n+ print_hook_start_line(hook_text, idx, num_hooks)\\n \\n- if dbt.flags.STRICT_MODE:\\n- Hook(**hook_dict)\\n+ with Timer() as timer:\\n+ if len(sql.strip()) > 0:\\n+ status, _ = adapter.execute(sql, auto_begin=False,\\n+ fetch=False)\\n+ self.ran_hooks.append(hook)\\n \\n- sql = hook_dict.get('sql', '')\\n+ print_hook_end_line(hook_text, status, idx, num_hooks,\\n+ timer.elapsed)\\n \\n- if len(sql.strip()) > 0:\\n- adapter.execute(sql, auto_begin=False, fetch=False)\\n+ print_timestamped_line(\\\"\\\")\\n \\n def safe_run_hooks(self, adapter, hook_type, extra_context):\\n try:\\n@@ -57,10 +110,9 @@ def safe_run_hooks(self, adapter, hook_type, extra_context):\\n logger.info(\\\"Database error while running {}\\\".format(hook_type))\\n raise\\n \\n- @classmethod\\n- def print_results_line(cls, results, execution_time):\\n- nodes = [r.node for r in results]\\n- stat_line = dbt.ui.printer.get_counts(nodes)\\n+ def print_results_line(self, results, execution_time):\\n+ nodes = [r.node for r in results] + self.ran_hooks\\n+ stat_line = get_counts(nodes)\\n \\n execution = \\\"\\\"\\n \\n@@ -68,8 +120,8 @@ def print_results_line(cls, results, execution_time):\\n execution = \\\" in {execution_time:0.2f}s\\\".format(\\n execution_time=execution_time)\\n \\n- dbt.ui.printer.print_timestamped_line(\\\"\\\")\\n- dbt.ui.printer.print_timestamped_line(\\n+ print_timestamped_line(\\\"\\\")\\n+ print_timestamped_line(\\n \\\"Finished running {stat_line}{execution}.\\\"\\n .format(stat_line=stat_line, execution=execution))\\n \\n@@ -107,7 +159,7 @@ def get_runner_type(self):\\n \\n def task_end_messages(self, results):\\n if results:\\n- dbt.ui.printer.print_run_end_messages(results)\\n+ print_run_end_messages(results)\\n \\n \\n class RemoteRunTask(RemoteCompileTask, RunTask):\\ndiff --git a/core/dbt/ui/printer.py b/core/dbt/ui/printer.py\\nindex cc02bd50d7a..8bbdd294ae8 100644\\n--- a/core/dbt/ui/printer.py\\n+++ b/core/dbt/ui/printer.py\\n@@ -49,7 +49,8 @@ def print_timestamped_line(msg, use_color=None):\\n logger.info(\\\"{} | {}\\\".format(get_timestamp(), msg))\\n \\n \\n-def print_fancy_output_line(msg, status, index, total, execution_time=None):\\n+def print_fancy_output_line(msg, status, index, total, execution_time=None,\\n+ truncate=False):\\n if index is None or total is None:\\n progress = ''\\n else:\\n@@ -60,6 +61,8 @@ def print_fancy_output_line(msg, status, index, total, execution_time=None):\\n message=msg)\\n \\n justified = prefix.ljust(80, \\\".\\\")\\n+ if truncate and len(justified) > 77:\\n+ justified = justified[:77] + '...'\\n \\n if execution_time is None:\\n status_time = \\\"\\\"\\n@@ -83,6 +86,8 @@ def get_counts(flat_nodes):\\n \\n if node.get('resource_type') == NodeType.Model:\\n t = '{} {}'.format(get_materialization(node), t)\\n+ elif node.get('resource_type') == NodeType.Operation:\\n+ t = 'hook'\\n \\n counts[t] = counts.get(t, 0) + 1\\n \\n@@ -97,6 +102,18 @@ def print_start_line(description, index, total):\\n print_fancy_output_line(msg, 'RUN', index, total)\\n \\n \\n+def print_hook_start_line(statement, index, total):\\n+ msg = 'START hook: {}'.format(statement)\\n+ print_fancy_output_line(msg, 'RUN', index, total, truncate=True)\\n+\\n+\\n+def print_hook_end_line(statement, status, index, total, execution_time):\\n+ msg = 'OK hook: {}'.format(statement)\\n+ # hooks don't fail into this path, so always green\\n+ print_fancy_output_line(msg, green(status), index, total,\\n+ execution_time=execution_time, truncate=True)\\n+\\n+\\n def print_skip_line(model, schema, relation, index, num_models):\\n msg = 'SKIP relation {}.{}'.format(schema, relation)\\n print_fancy_output_line(msg, yellow('SKIP'), index, num_models)\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -33,22 +73,35 @@ def run_hooks(self, adapter, hook_type, extra_context):\n # b/c psycopg2 automatically begins a transaction when a connection\n # is created.\n adapter.clear_transaction()\n+ if not ordered_hooks:\n+ return\n+ num_hooks = len(ordered_hooks)\n+\n+ plural = 'hook' if num_hooks == 1 else 'hooks'\n+ print_timestamped_line(\"\")\n+ print_timestamped_line(\n+ 'Running {} {} {}'.format(num_hooks, hook_type, plural)\n+ )\n \n- for i, hook in enumerate(ordered_hooks):\n- compiled = compile_node(adapter, self.config, hook,\n- self.manifest, extra_context)\n- statement = compiled.wrapped_sql\n+ for idx, hook in enumerate(ordered_hooks, start=1):\n+ sql = self.get_hook_sql(adapter, hook, idx, num_hooks,\n+ extra_context)\n \n- hook_index = hook.get('index', len(hooks))\n- hook_dict = get_hook_dict(statement, index=hook_index)\n+ # convert all whitespace sequences to single spaces\n+ hook_text = ' '.join(sql.split())","line":null,"original_line":91,"original_start_line":null,"path":"core/dbt/task/run.py","start_line":null,"text":"@user1:\n```suggestion\r\n```"}],"string":"[\n {\n \"diff_hunk\": \"@@ -33,22 +73,35 @@ def run_hooks(self, adapter, hook_type, extra_context):\\n # b/c psycopg2 automatically begins a transaction when a connection\\n # is created.\\n adapter.clear_transaction()\\n+ if not ordered_hooks:\\n+ return\\n+ num_hooks = len(ordered_hooks)\\n+\\n+ plural = 'hook' if num_hooks == 1 else 'hooks'\\n+ print_timestamped_line(\\\"\\\")\\n+ print_timestamped_line(\\n+ 'Running {} {} {}'.format(num_hooks, hook_type, plural)\\n+ )\\n \\n- for i, hook in enumerate(ordered_hooks):\\n- compiled = compile_node(adapter, self.config, hook,\\n- self.manifest, extra_context)\\n- statement = compiled.wrapped_sql\\n+ for idx, hook in enumerate(ordered_hooks, start=1):\\n+ sql = self.get_hook_sql(adapter, hook, idx, num_hooks,\\n+ extra_context)\\n \\n- hook_index = hook.get('index', len(hooks))\\n- hook_dict = get_hook_dict(statement, index=hook_index)\\n+ # convert all whitespace sequences to single spaces\\n+ hook_text = ' '.join(sql.split())\",\n \"line\": null,\n \"original_line\": 91,\n \"original_start_line\": null,\n \"path\": \"core/dbt/task/run.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\n```suggestion\\r\\n```\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"f6bf8d912a2d8fecf596bbf0f2310cb7c1450b27"},"merged_patch":{"kind":"string","value":"diff --git a/core/dbt/logger.py b/core/dbt/logger.py\nindex f658769172f..9840d8c8fc8 100644\n--- a/core/dbt/logger.py\n+++ b/core/dbt/logger.py\n@@ -67,6 +67,10 @@ def notice(self, msg, *args, **kwargs):\n \n # provide this for the cache.\n CACHE_LOGGER = logging.getLogger('dbt.cache')\n+# add a dummy handler to avoid `No handlers could be found for logger`\n+nothing_handler = logging.StreamHandler()\n+nothing_handler.setLevel(CRITICAL)\n+CACHE_LOGGER.addHandler(nothing_handler)\n # provide this for RPC connection logging\n RPC_LOGGER = logging.getLogger('dbt.rpc')\n \ndiff --git a/core/dbt/task/run.py b/core/dbt/task/run.py\nindex 3e7903a3736..53a769c6b6d 100644\n--- a/core/dbt/task/run.py\n+++ b/core/dbt/task/run.py\n@@ -1,54 +1,126 @@\n from __future__ import print_function\n \n+import functools\n+import time\n+\n from dbt.logger import GLOBAL_LOGGER as logger\n from dbt.node_types import NodeType, RunHookType\n from dbt.node_runners import ModelRunner, RPCExecuteRunner\n \n import dbt.exceptions\n import dbt.flags\n-import dbt.ui.printer\n from dbt.contracts.graph.parsed import Hook\n from dbt.hooks import get_hook_dict\n+from dbt.ui.printer import \\\n+ print_hook_start_line, \\\n+ print_hook_end_line, \\\n+ print_timestamped_line, \\\n+ print_run_end_messages, \\\n+ get_counts\n \n from dbt.compilation import compile_node\n from dbt.task.compile import CompileTask, RemoteCompileTask\n from dbt.utils import get_nodes_by_tags\n \n \n+class Timer(object):\n+ def __init__(self):\n+ self.start = None\n+ self.end = None\n+\n+ @property\n+ def elapsed(self):\n+ if self.start is None or self.end is None:\n+ return None\n+ return self.end - self.start\n+\n+ def __enter__(self):\n+ self.start = time.time()\n+ return self\n+\n+ def __exit__(self, exc_type, exc_value, exc_tracebck):\n+ self.end = time.time()\n+\n+\n+@functools.total_ordering\n+class BiggestName(object):\n+ def __lt__(self, other):\n+ return True\n+\n+ def __eq__(self, other):\n+ return isinstance(other, self.__class__)\n+\n+\n class RunTask(CompileTask):\n+ def __init__(self, args, config):\n+ super(RunTask, self).__init__(args, config)\n+ self.ran_hooks = []\n+\n def raise_on_first_error(self):\n return False\n \n def populate_adapter_cache(self, adapter):\n adapter.set_relations_cache(self.manifest)\n \n- def run_hooks(self, adapter, hook_type, extra_context):\n-\n+ def get_hook_sql(self, adapter, hook, idx, num_hooks, extra_context):\n+ compiled = compile_node(adapter, self.config, hook, self.manifest,\n+ extra_context)\n+ statement = compiled.wrapped_sql\n+ hook_index = hook.get('index', num_hooks)\n+ hook_dict = get_hook_dict(statement, index=hook_index)\n+ if dbt.flags.STRICT_MODE:\n+ Hook(**hook_dict)\n+ return hook_dict.get('sql', '')\n+\n+ def _hook_keyfunc(self, hook):\n+ package_name = hook.package_name\n+ if package_name == self.config.project_name:\n+ package_name = BiggestName()\n+ return package_name, hook.index\n+\n+ def get_hooks_by_type(self, hook_type):\n nodes = self.manifest.nodes.values()\n+ # find all hooks defined in the manifest (could be multiple projects)\n hooks = get_nodes_by_tags(nodes, {hook_type}, NodeType.Operation)\n+ hooks.sort(key=self._hook_keyfunc)\n+ return hooks\n \n- ordered_hooks = sorted(hooks, key=lambda h: h.get('index', len(hooks)))\n+ def run_hooks(self, adapter, hook_type, extra_context):\n+ ordered_hooks = self.get_hooks_by_type(hook_type)\n \n # on-run-* hooks should run outside of a transaction. This happens\n # b/c psycopg2 automatically begins a transaction when a connection\n # is created.\n adapter.clear_transaction()\n+ if not ordered_hooks:\n+ return\n+ num_hooks = len(ordered_hooks)\n+\n+ plural = 'hook' if num_hooks == 1 else 'hooks'\n+ print_timestamped_line(\"\")\n+ print_timestamped_line(\n+ 'Running {} {} {}'.format(num_hooks, hook_type, plural)\n+ )\n \n- for i, hook in enumerate(ordered_hooks):\n- compiled = compile_node(adapter, self.config, hook,\n- self.manifest, extra_context)\n- statement = compiled.wrapped_sql\n+ for idx, hook in enumerate(ordered_hooks, start=1):\n+ sql = self.get_hook_sql(adapter, hook, idx, num_hooks,\n+ extra_context)\n \n- hook_index = hook.get('index', len(hooks))\n- hook_dict = get_hook_dict(statement, index=hook_index)\n+ hook_text = '{}.{}.{}'.format(hook.package_name, hook_type,\n+ hook.index)\n+ print_hook_start_line(hook_text, idx, num_hooks)\n+ status = 'OK'\n \n- if dbt.flags.STRICT_MODE:\n- Hook(**hook_dict)\n+ with Timer() as timer:\n+ if len(sql.strip()) > 0:\n+ status, _ = adapter.execute(sql, auto_begin=False,\n+ fetch=False)\n+ self.ran_hooks.append(hook)\n \n- sql = hook_dict.get('sql', '')\n+ print_hook_end_line(hook_text, status, idx, num_hooks,\n+ timer.elapsed)\n \n- if len(sql.strip()) > 0:\n- adapter.execute(sql, auto_begin=False, fetch=False)\n+ print_timestamped_line(\"\")\n \n def safe_run_hooks(self, adapter, hook_type, extra_context):\n try:\n@@ -57,10 +129,9 @@ def safe_run_hooks(self, adapter, hook_type, extra_context):\n logger.info(\"Database error while running {}\".format(hook_type))\n raise\n \n- @classmethod\n- def print_results_line(cls, results, execution_time):\n- nodes = [r.node for r in results]\n- stat_line = dbt.ui.printer.get_counts(nodes)\n+ def print_results_line(self, results, execution_time):\n+ nodes = [r.node for r in results] + self.ran_hooks\n+ stat_line = get_counts(nodes)\n \n execution = \"\"\n \n@@ -68,8 +139,8 @@ def print_results_line(cls, results, execution_time):\n execution = \" in {execution_time:0.2f}s\".format(\n execution_time=execution_time)\n \n- dbt.ui.printer.print_timestamped_line(\"\")\n- dbt.ui.printer.print_timestamped_line(\n+ print_timestamped_line(\"\")\n+ print_timestamped_line(\n \"Finished running {stat_line}{execution}.\"\n .format(stat_line=stat_line, execution=execution))\n \n@@ -107,7 +178,7 @@ def get_runner_type(self):\n \n def task_end_messages(self, results):\n if results:\n- dbt.ui.printer.print_run_end_messages(results)\n+ print_run_end_messages(results)\n \n \n class RemoteRunTask(RemoteCompileTask, RunTask):\ndiff --git a/core/dbt/ui/printer.py b/core/dbt/ui/printer.py\nindex cc02bd50d7a..8bbdd294ae8 100644\n--- a/core/dbt/ui/printer.py\n+++ b/core/dbt/ui/printer.py\n@@ -49,7 +49,8 @@ def print_timestamped_line(msg, use_color=None):\n logger.info(\"{} | {}\".format(get_timestamp(), msg))\n \n \n-def print_fancy_output_line(msg, status, index, total, execution_time=None):\n+def print_fancy_output_line(msg, status, index, total, execution_time=None,\n+ truncate=False):\n if index is None or total is None:\n progress = ''\n else:\n@@ -60,6 +61,8 @@ def print_fancy_output_line(msg, status, index, total, execution_time=None):\n message=msg)\n \n justified = prefix.ljust(80, \".\")\n+ if truncate and len(justified) > 77:\n+ justified = justified[:77] + '...'\n \n if execution_time is None:\n status_time = \"\"\n@@ -83,6 +86,8 @@ def get_counts(flat_nodes):\n \n if node.get('resource_type') == NodeType.Model:\n t = '{} {}'.format(get_materialization(node), t)\n+ elif node.get('resource_type') == NodeType.Operation:\n+ t = 'hook'\n \n counts[t] = counts.get(t, 0) + 1\n \n@@ -97,6 +102,18 @@ def print_start_line(description, index, total):\n print_fancy_output_line(msg, 'RUN', index, total)\n \n \n+def print_hook_start_line(statement, index, total):\n+ msg = 'START hook: {}'.format(statement)\n+ print_fancy_output_line(msg, 'RUN', index, total, truncate=True)\n+\n+\n+def print_hook_end_line(statement, status, index, total, execution_time):\n+ msg = 'OK hook: {}'.format(statement)\n+ # hooks don't fail into this path, so always green\n+ print_fancy_output_line(msg, green(status), index, total,\n+ execution_time=execution_time, truncate=True)\n+\n+\n def print_skip_line(model, schema, relation, index, num_models):\n msg = 'SKIP relation {}.{}'.format(schema, relation)\n print_fancy_output_line(msg, yellow('SKIP'), index, num_models)\ndiff --git a/test/integration/006_simple_dependency_test/early_hook_dependency/dbt_project.yml b/test/integration/006_simple_dependency_test/early_hook_dependency/dbt_project.yml\nnew file mode 100644\nindex 00000000000..7d83235e470\n--- /dev/null\n+++ b/test/integration/006_simple_dependency_test/early_hook_dependency/dbt_project.yml\n@@ -0,0 +1,5 @@\n+name: early_hooks\n+version: '1.0'\n+on-run-start:\n+ - create table {{ var('test_create_table') }} as (select 1 as id)\n+ - create table {{ var('test_create_second_table') }} as (select 3 as id)\ndiff --git a/test/integration/006_simple_dependency_test/hook_models/actual.sql b/test/integration/006_simple_dependency_test/hook_models/actual.sql\nnew file mode 100644\nindex 00000000000..65c31900590\n--- /dev/null\n+++ b/test/integration/006_simple_dependency_test/hook_models/actual.sql\n@@ -0,0 +1,3 @@\n+select * from {{ var('test_create_table') }}\n+union all\n+select * from {{ var('test_create_second_table') }}\ndiff --git a/test/integration/006_simple_dependency_test/hook_models/expected.sql b/test/integration/006_simple_dependency_test/hook_models/expected.sql\nnew file mode 100644\nindex 00000000000..152fc5d286f\n--- /dev/null\n+++ b/test/integration/006_simple_dependency_test/hook_models/expected.sql\n@@ -0,0 +1,6 @@\n+{# surely there is a better way to do this! #}\n+\n+{% for _ in range(1, 5) %}\n+select {{ loop.index }} as id\n+{% if not loop.last %}union all{% endif %}\n+{% endfor %}\ndiff --git a/test/integration/006_simple_dependency_test/late_hook_dependency/dbt_project.yml b/test/integration/006_simple_dependency_test/late_hook_dependency/dbt_project.yml\nnew file mode 100644\nindex 00000000000..d67b089273f\n--- /dev/null\n+++ b/test/integration/006_simple_dependency_test/late_hook_dependency/dbt_project.yml\n@@ -0,0 +1,5 @@\n+name: late_hooks\n+version: '1.0'\n+on-run-start:\n+ - insert into {{ var('test_create_table') }} values (2)\n+ - insert into {{ var('test_create_second_table') }} values (4)\ndiff --git a/test/integration/006_simple_dependency_test/test_local_dependency.py b/test/integration/006_simple_dependency_test/test_local_dependency.py\nindex b7a231aa3e1..27b7a9719a5 100644\n--- a/test/integration/006_simple_dependency_test/test_local_dependency.py\n+++ b/test/integration/006_simple_dependency_test/test_local_dependency.py\n@@ -1,4 +1,5 @@\n from test.integration.base import DBTIntegrationTest, use_profile\n+import json\n import mock\n \n import dbt.semver\n@@ -97,3 +98,53 @@ def test_postgres_local_dependency_out_of_date_no_check(self, mock_get):\n self.run_dbt(['deps'])\n results = self.run_dbt(['run', '--no-version-check'])\n self.assertEqual(len(results), 3)\n+\n+\n+class TestSimpleDependencyHooks(DBTIntegrationTest):\n+ @property\n+ def schema(self):\n+ return \"hooks_dependency_006\"\n+\n+ @property\n+ def models(self):\n+ return \"test/integration/006_simple_dependency_test/hook_models\"\n+\n+ @property\n+ def project_config(self):\n+ # these hooks should run first, so nothing to drop\n+ return {\n+ 'on-run-start': [\n+ \"drop table if exists {{ var('test_create_table') }}\",\n+ \"drop table if exists {{ var('test_create_second_table') }}\",\n+ ]\n+ }\n+\n+ @property\n+ def packages_config(self):\n+ return {\n+ \"packages\": [\n+ {\n+ 'local': 'test/integration/006_simple_dependency_test/early_hook_dependency'\n+ },\n+ {\n+ 'local': 'test/integration/006_simple_dependency_test/late_hook_dependency'\n+ }\n+ ]\n+ }\n+\n+ def base_schema(self):\n+ return self.unique_schema()\n+\n+ def configured_schema(self):\n+ return self.unique_schema() + '_configured'\n+\n+ @use_profile('postgres')\n+ def test_postgres_hook_dependency(self):\n+ cli_vars = json.dumps({\n+ 'test_create_table': '\"{}\".\"hook_test\"'.format(self.unique_schema()),\n+ 'test_create_second_table': '\"{}\".\"hook_test_2\"'.format(self.unique_schema())\n+ })\n+ self.run_dbt([\"deps\", '--vars', cli_vars])\n+ results = self.run_dbt([\"run\", '--vars', cli_vars])\n+ self.assertEqual(len(results), 2)\n+ self.assertTablesEqual('actual', 'expected')\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2379,"cells":{"instance_id":{"kind":"string","value":"ccxt__ccxt-20802@980d87f"},"repo":{"kind":"string","value":"ccxt/ccxt"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":20802,"string":"20,802"},"title":{"kind":"string","value":"fetchOHLCV: switch between current and history candles"},"body":{"kind":"string","value":"Edited how fetchOHLCV switches between history and current candles in the since handling\r\nfixes: #20756\r\n### Test 1 (history candles):\r\n```\r\nconst hourInMs = 3600 * 1000;\r\nsince = this.milliseconds() - 1439 * hourInMs;\r\n```\r\n```\r\nokx.fetchOHLCV (BTC/USDT, 1h, 1699862134346, 300)\r\n\r\nokx GET https://www.okx.com/api/v5/market/history-candles?instId=BTC-USDT&bar=1H&limit=300&before=1699862134346&after=1700942134346\r\n\r\n1700582400000 | 36974.8 | 37260.1 | 36750 | 37190.8 | 14441.17524511\r\n1700586000000 | 37191.5 | 37509.7 | 36612.4 | 36900 | 90031.81273416\r\n1700589600000 | 36903.9 | 36964.6 | 35779.1 | 35853.3 | 120.9956569\r\n...\r\n1700931600000 | 37744 | 37799.3 | 37700 | 37770 | 674.07239716\r\n1700935200000 | 37770 | 37820.2 | 37755.4 | 37818.3 | 746.98028882\r\n1700938800000 | 37819 | 37840 | 37790.2 | 37818.3 | 684.92567018\r\n100 objects\r\n```\r\n### Test 2 (current candles):\r\n```\r\nconst hourInMs = 3600 * 1000;\r\nsince = this.milliseconds() - 1438 * hourInMs;\r\n```\r\n```\r\nokx.fetchOHLCV (BTC/USDT, 1h,1699865851198 , 300)\r\n\r\nokx GET https://www.okx.com/api/v5/market/candles?instId=BTC-USDT&bar=1H&limit=300&before=1699865851198&after=1700945851198\r\n\r\n1699866000000 | 37027.4 | 37040.1 | 36947.3 | 36982 | 1507.79655319\r\n1699869600000 | 36984 | 37009.1 | 36914.9 | 36973.7 | 2561.28039174\r\n1699873200000 | 36972.8 | 36973.7 | 36700.8 | 36817.3 | 5842.25295832\r\n...\r\n1700935200000 | 37770 | 37820.2 | 37755.4 | 37818.3 | 746.98028882\r\n1700938800000 | 37819 | 37840 | 37790.2 | 37818.3 | 684.92567018\r\n1700942400000 | 37818.3 | 37886.9 | 37766.6 | 37800.1 | 1017.9527583\r\n300 objects\r\n```"},"created_at":{"kind":"string","value":"2024-01-12T08:06:34Z"},"problem_statement":{"kind":"string","value":"Okx fetch_ohlcv candles/history candles automatic switch issue\n### Operating System\r\n\r\nWindows 10\r\n\r\n### Programming Languages\r\n\r\n_No response_\r\n\r\n### CCXT Version\r\n\r\n4.2.9\r\n\r\n### Description\r\n\r\nOkx states that limit is 300 for live candles, and 100 for history candles\r\nAnd api may return 1440 live candles\r\n\r\nIf i query live candles started from 1200 candles back i expect to get 300 live candles, not 100 history ones\r\n\r\nsince = self.exchange.milliseconds() - 1200 * self.exchange.parse_timeframe('5m')\r\nklines = self.exchange.fetch_ohlcv(symbol='BTCUSDT', timeframe='5m', since=since, limit=300, params=params)\r\n\r\nCode returns only 100 results. But has to return 300.\r\n\r\nWith this code i can get 300 candles only for last 1140 candles (This is 1440 - 300), not for 1440\r\n\r\n\r\nWhy?\r\n\r\nBecause in okx fetch_ohlcv limit substracted from available 1440 candles. \r\nIt has not to be substracted\r\n\r\n### Code\r\nokx:2080-2091\r\n```\r\n if since is not None:\r\n now = self.milliseconds()\r\n difference = now - since\r\n durationInMilliseconds = duration * 1000\r\n # if the since timestamp is more than limit candles back in the past\r\n # additional one bar for max offset to round the current day to UTC\r\n calc = (1440 - limit - 1) * durationInMilliseconds\r\n if difference > calc:\r\n defaultType = 'HistoryCandles'\r\n startTime = max(since - 1, 0)\r\n request['before'] = startTime\r\n request['after'] = self.sum(startTime, durationInMilliseconds * limit)`\r\n\r\n```\r\n\r\ncalc = (1440 - limit - 1) * durationInMilliseconds\r\nhas to be replaced to \r\ncalc = 1439 * durationInMilliseconds"},"hints_text":{"kind":"string","value":"Hey @Alfavisioner I think your question might be answered by the comment in the code snippet you posted:\r\n`# if the since timestamp is more than limit candles back in the past` then the history candles with a limit of 100 are used, based on that I don't think it makes sense to remove limit from calc because then I'm not sure if the whole `if difference > calc` segment would work properly.\r\n\r\nHere is my response from your example fetch_ohlcv call:\r\n```\r\nokx.fetchOHLCV (BTC/USDT, 5m, 1704955844524, 300)\r\n2024-01-11T06:56:44.919Z iteration 0 passed in 396 ms\r\n\r\n1704956100000 | 45767.6 | 45900 | 45765.8 | 45765.8 | 2.97980933\r\n1 objects\r\n```\r\nAnd your proposed changes return the same result for me so I'm not sure what I'm missing.\r\n\r\nIf I'm misunderstanding your issue please elaborate on your **Description** section in a clear way, I found it a bit hard to follow what you were trying to say\r\n\r\nYou can also review this PR where the change that you are debating was introduced and see if the logic stands https://github.com/ccxt/ccxt/pull/18264\r\n\r\nThanks, Dan\nOkx exchange uses 2 modes to return candles\r\n1. Live mode for last 1440 candles with limit 300 and maximim 40 requests per 2 seconds\r\n2. History mode with limit 100 and maximim 20 requests per 2 seconds\r\n\r\nLook at cases:\r\n1.\r\n```\r\nfrom ccxt import okx\r\nex = okx()\r\n\r\nhourInMs = 3600 * 1000\r\nsince = ex.milliseconds() - 1439 * hourInMs\r\nklines = ex.fetch_ohlcv('BTC/USDT', '1h', since, limit= 300)\r\nprint(len(klines))\r\n\r\n### Output\r\n100\r\nHas to be 300\r\n\r\n```\r\n\r\n\r\n\r\nCase 1 queries klines 1440 periods back. We deduct 1 to take into account current unclosed candle.\r\nAccording to okex documentation it has to return 300 candles.\r\nIt returns only 100 instead of 300\r\n\r\n2.\r\n```\r\nfrom ccxt import okx\r\nex = okx()\r\n\r\nhourInMs = 3600 * 1000\r\nsince = ex.milliseconds() - 1200 * hourInMs\r\nklines = ex.fetch_ohlcv('BTC/USDT', '1h', since, limit= 300)\r\nprint(len(klines))\r\n\r\n### Output\r\n100\r\nHas to be 300\r\n\r\n```\r\n\r\nCase 2 query 1200 klines back\r\nReturns only 100 instead of 300\r\n\r\n3.\r\n```\r\nfrom ccxt import okx\r\nex = okx()\r\n\r\nhourInMs = 3600 * 1000\r\nsince = ex.milliseconds() - 1000 * hourInMs\r\nklines = ex.fetch_ohlcv('BTC/USDT', '1h', since, limit= 300)\r\nprint(len(klines))\r\n\r\n### Output\r\n300\r\nAll is ok\r\n\r\n```\r\n\r\nCase 3 query 1000 klines back\r\nReturns 300 as expected\r\n\r\n\r\n**_Why we have this issue:_**\r\nBecause of deducted limit in calc variable. Code just switched from Candles to HisitoryCandles earlier than necessary:\r\ncalc = (1440 - limit - 1) * durationInMilliseconds\r\nIf you deduct limit variable from 1440, you just move minimum possible Candles timestamp on value of limit. It becomes 1140 in our case. \r\n\r\n\r\n**_Research:_**\r\nFirst of all i investigated issue: https://github.com/ccxt/ccxt/pull/18264\r\n\r\nFound that it is posible 3 cases:\r\na) _before_ and _after_ are located left on timeline camparing to 1440 border. HistoryCandles mode has to be used:\r\nb) _before_ and _after_ are located right on timeline camparing to 1440 border. Candles mode has to be used:\r\nc) _before_ is left, _after_ is right (case https://github.com/ccxt/ccxt/pull/18264). HistoryCandles mode has to be used:\r\n\r\n\r\n**_My proposed solution:_**\r\nTo be frankly, calc variable is non descriptive and difference variable confusing too:\r\nPropose to use historyBorder variable instead:\r\nhistoryBorder = now - ((1440 - 1) * durationInMilliseconds)\r\n\r\nPropose to change code from:\r\n```\r\n now = self.milliseconds()\r\n difference = now - since\r\n durationInMilliseconds = duration * 1000\r\n # if the since timestamp is more than limit candles back in the past\r\n # additional one bar for max offset to round the current day to UTC\r\n calc = (1440 - limit - 1) * durationInMilliseconds\r\n if difference > calc:\r\n defaultType = 'HistoryCandles'\r\n startTime = max(since - 1, 0)\r\n request['before'] = startTime\r\n request['after'] = self.sum(startTime, durationInMilliseconds * limit)\r\n```\r\n\r\nto:\r\n\r\n```\r\n now = self.milliseconds()\r\n durationInMilliseconds = duration * 1000\r\n # if the since timestamp is more than limit candles back in the past\r\n # additional one bar for max offset to round the current day to UTC\r\n historyBorder = now - ((1440 - 1) * durationInMilliseconds)\r\n startTime = max(since - 1, 0)\r\n if startTime >= historyBorder:\r\n defaultType = 'Candles'\r\n else:\r\n defaultType = 'HistoryCandles'\r\n request['before'] = startTime\r\n request['after'] = self.sum(startTime, durationInMilliseconds * limit)\r\n```"},"resolved_issues":{"kind":"list like","value":[{"body":"### Operating System\r\n\r\nWindows 10\r\n\r\n### Programming Languages\r\n\r\n_No response_\r\n\r\n### CCXT Version\r\n\r\n4.2.9\r\n\r\n### Description\r\n\r\nOkx states that limit is 300 for live candles, and 100 for history candles\r\nAnd api may return 1440 live candles\r\n\r\nIf i query live candles started from 1200 candles back i expect to get 300 live candles, not 100 history ones\r\n\r\nsince = self.exchange.milliseconds() - 1200 * self.exchange.parse_timeframe('5m')\r\nklines = self.exchange.fetch_ohlcv(symbol='BTCUSDT', timeframe='5m', since=since, limit=300, params=params)\r\n\r\nCode returns only 100 results. But has to return 300.\r\n\r\nWith this code i can get 300 candles only for last 1140 candles (This is 1440 - 300), not for 1440\r\n\r\n\r\nWhy?\r\n\r\nBecause in okx fetch_ohlcv limit substracted from available 1440 candles. \r\nIt has not to be substracted\r\n\r\n### Code\r\nokx:2080-2091\r\n```\r\n if since is not None:\r\n now = self.milliseconds()\r\n difference = now - since\r\n durationInMilliseconds = duration * 1000\r\n # if the since timestamp is more than limit candles back in the past\r\n # additional one bar for max offset to round the current day to UTC\r\n calc = (1440 - limit - 1) * durationInMilliseconds\r\n if difference > calc:\r\n defaultType = 'HistoryCandles'\r\n startTime = max(since - 1, 0)\r\n request['before'] = startTime\r\n request['after'] = self.sum(startTime, durationInMilliseconds * limit)`\r\n\r\n```\r\n\r\ncalc = (1440 - limit - 1) * durationInMilliseconds\r\nhas to be replaced to \r\ncalc = 1439 * durationInMilliseconds\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n","number":20756,"title":"Okx fetch_ohlcv candles/history candles automatic switch issue"}],"string":"[\n {\n \"body\": \"### Operating System\\r\\n\\r\\nWindows 10\\r\\n\\r\\n### Programming Languages\\r\\n\\r\\n_No response_\\r\\n\\r\\n### CCXT Version\\r\\n\\r\\n4.2.9\\r\\n\\r\\n### Description\\r\\n\\r\\nOkx states that limit is 300 for live candles, and 100 for history candles\\r\\nAnd api may return 1440 live candles\\r\\n\\r\\nIf i query live candles started from 1200 candles back i expect to get 300 live candles, not 100 history ones\\r\\n\\r\\nsince = self.exchange.milliseconds() - 1200 * self.exchange.parse_timeframe('5m')\\r\\nklines = self.exchange.fetch_ohlcv(symbol='BTCUSDT', timeframe='5m', since=since, limit=300, params=params)\\r\\n\\r\\nCode returns only 100 results. But has to return 300.\\r\\n\\r\\nWith this code i can get 300 candles only for last 1140 candles (This is 1440 - 300), not for 1440\\r\\n\\r\\n\\r\\nWhy?\\r\\n\\r\\nBecause in okx fetch_ohlcv limit substracted from available 1440 candles. \\r\\nIt has not to be substracted\\r\\n\\r\\n### Code\\r\\nokx:2080-2091\\r\\n```\\r\\n if since is not None:\\r\\n now = self.milliseconds()\\r\\n difference = now - since\\r\\n durationInMilliseconds = duration * 1000\\r\\n # if the since timestamp is more than limit candles back in the past\\r\\n # additional one bar for max offset to round the current day to UTC\\r\\n calc = (1440 - limit - 1) * durationInMilliseconds\\r\\n if difference > calc:\\r\\n defaultType = 'HistoryCandles'\\r\\n startTime = max(since - 1, 0)\\r\\n request['before'] = startTime\\r\\n request['after'] = self.sum(startTime, durationInMilliseconds * limit)`\\r\\n\\r\\n```\\r\\n\\r\\ncalc = (1440 - limit - 1) * durationInMilliseconds\\r\\nhas to be replaced to \\r\\ncalc = 1439 * durationInMilliseconds\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n \\r\\n\\r\\n\",\n \"number\": 20756,\n \"title\": \"Okx fetch_ohlcv candles/history candles automatic switch issue\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"e34212db9dd6aeff7d652f38f5ce34ddc916f59f"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"980d87f0e2a78e7d609623b8d4940672163a3697\",\n \"head_commit_message\": \"fix(fetchOHLCV): switch between current and history candles\\n\\n```\\nconst hourInMs = 3600 * 1000;\\nsince = this.milliseconds() - 1440 * hourInMs;\\n```\\n```\\nokx.fetchOHLCV (BTC/USDT, 1h,1699862134346 , 300)\\n\\nokx GET https://www.okx.com/api/v5/market/history-candles?instId=BTC-USDT&bar=1H&limit=300&before=1699862134346&after=1700942134346\\n\\n1700582400000 | 36974.8 | 37260.1 | 36750 | 37190.8 | 14441.17524511\\n1700586000000 | 37191.5 | 37509.7 | 36612.4 | 36900 | 90031.81273416\\n1700589600000 | 36903.9 | 36964.6 | 35779.1 | 35853.3 | 120.9956569\\n...\\n1700931600000 | 37744 | 37799.3 | 37700 | 37770 | 674.07239716\\n1700935200000 | 37770 | 37820.2 | 37755.4 | 37818.3 | 746.98028882\\n1700938800000 | 37819 | 37840 | 37790.2 | 37818.3 | 684.92567018\\n100 objects\\n```\\n```\\nconst hourInMs = 3600 * 1000;\\nsince = this.milliseconds() - 1439 * hourInMs;\\n```\\n```\\nokx.fetchOHLCV (BTC/USDT, 1h,1699865851198 , 300)\\n\\nokx GET https://www.okx.com/api/v5/market/candles?instId=BTC-USDT&bar=1H&limit=300&before=1699865851198&after=1700945851198\\n\\n1699866000000 | 37027.4 | 37040.1 | 36947.3 | 36982 | 1507.79655319\\n1699869600000 | 36984 | 37009.1 | 36914.9 | 36973.7 | 2561.28039174\\n1699873200000 | 36972.8 | 36973.7 | 36700.8 | 36817.3 | 5842.25295832\\n...\\n1700935200000 | 37770 | 37820.2 | 37755.4 | 37818.3 | 746.98028882\\n1700938800000 | 37819 | 37840 | 37790.2 | 37818.3 | 684.92567018\\n1700942400000 | 37818.3 | 37886.9 | 37766.6 | 37800.1 | 1017.9527583\\n300 objects\\n```\",\n \"patch_to_review\": \"diff --git a/ts/src/okx.ts b/ts/src/okx.ts\\nindex d66a18cceae37..2caf1efbf5b28 100644\\n--- a/ts/src/okx.ts\\n+++ b/ts/src/okx.ts\\n@@ -2146,17 +2146,14 @@ export default class okx extends Exchange {\\n let defaultType = 'Candles';\\n if (since !== undefined) {\\n const now = this.milliseconds ();\\n- const difference = now - since;\\n const durationInMilliseconds = duration * 1000;\\n- // if the since timestamp is more than limit candles back in the past\\n- // additional one bar for max offset to round the current day to UTC\\n- const calc = (1440 - limit - 1) * durationInMilliseconds;\\n- if (difference > calc) {\\n+ // switch to history candles if since is past the cutoff for current candles\\n+ const historyBorder = now - (1440 * durationInMilliseconds);\\n+ if (since <= historyBorder) {\\n defaultType = 'HistoryCandles';\\n }\\n- const startTime = Math.max (since - 1, 0);\\n- request['before'] = startTime;\\n- request['after'] = this.sum (startTime, durationInMilliseconds * limit);\\n+ request['before'] = since;\\n+ request['after'] = this.sum (since, durationInMilliseconds * limit);\\n }\\n const until = this.safeInteger (params, 'until');\\n if (until !== undefined) {\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -2146,17 +2146,14 @@ export default class okx extends Exchange {\n let defaultType = 'Candles';\n if (since !== undefined) {\n const now = this.milliseconds ();\n- const difference = now - since;\n const durationInMilliseconds = duration * 1000;\n- // if the since timestamp is more than limit candles back in the past\n- // additional one bar for max offset to round the current day to UTC\n- const calc = (1440 - limit - 1) * durationInMilliseconds;\n- if (difference > calc) {\n+ // switch to history candles if since is past the cutoff for current candles\n+ const historyBorder = now - (1440 * durationInMilliseconds);","line":null,"original_line":2151,"original_start_line":null,"path":"ts/src/okx.ts","start_line":null,"text":"@user1:\ni am not sure whether it's true what I am saying, but for safety and guaranteed behavior, i would have done this:\r\n\r\n```suggestion\r\n const historyBorder = now - (1440 - 1) * durationInMilliseconds);\r\n```\r\n\r\nthe reason is that the current bar might be considered as 1401th bar by exchange (idk, i just estimate it might be), so, it might be better to switch to `HistoryCandles` at 1439th bar (back from now) instead of exactly 1400th bar. 1 bar wouldn't much make any difference among users, however, it might save from unforeseen issues which might exist in exchange api because of current bar (which might be considered by API engine as 1401th bar) formation.\n\n@author:\nOkay I think that makes sense I'll add that change\n\n@user2:\nI also think -1 is necessary, because after we substract 1439 full periods 1 last nonclosed candle period left. 1440 total\n\n@user2:\nBut if okx exchange returns live Candles for full 1440 candles plus 1 non-closed, than -1 is not necessary. All depends on exchange side\n\n@user1:\n@user2 yes, it was just added as a \"possible\" safety measure, which might arise (however, unconfirmed). anayw, 1 bar is not any significant, however, worth for that safety check"}],"string":"[\n {\n \"diff_hunk\": \"@@ -2146,17 +2146,14 @@ export default class okx extends Exchange {\\n let defaultType = 'Candles';\\n if (since !== undefined) {\\n const now = this.milliseconds ();\\n- const difference = now - since;\\n const durationInMilliseconds = duration * 1000;\\n- // if the since timestamp is more than limit candles back in the past\\n- // additional one bar for max offset to round the current day to UTC\\n- const calc = (1440 - limit - 1) * durationInMilliseconds;\\n- if (difference > calc) {\\n+ // switch to history candles if since is past the cutoff for current candles\\n+ const historyBorder = now - (1440 * durationInMilliseconds);\",\n \"line\": null,\n \"original_line\": 2151,\n \"original_start_line\": null,\n \"path\": \"ts/src/okx.ts\",\n \"start_line\": null,\n \"text\": \"@user1:\\ni am not sure whether it's true what I am saying, but for safety and guaranteed behavior, i would have done this:\\r\\n\\r\\n```suggestion\\r\\n const historyBorder = now - (1440 - 1) * durationInMilliseconds);\\r\\n```\\r\\n\\r\\nthe reason is that the current bar might be considered as 1401th bar by exchange (idk, i just estimate it might be), so, it might be better to switch to `HistoryCandles` at 1439th bar (back from now) instead of exactly 1400th bar. 1 bar wouldn't much make any difference among users, however, it might save from unforeseen issues which might exist in exchange api because of current bar (which might be considered by API engine as 1401th bar) formation.\\n\\n@author:\\nOkay I think that makes sense I'll add that change\\n\\n@user2:\\nI also think -1 is necessary, because after we substract 1439 full periods 1 last nonclosed candle period left. 1440 total\\n\\n@user2:\\nBut if okx exchange returns live Candles for full 1440 candles plus 1 non-closed, than -1 is not necessary. All depends on exchange side\\n\\n@user1:\\n@user2 yes, it was just added as a \\\"possible\\\" safety measure, which might arise (however, unconfirmed). anayw, 1 bar is not any significant, however, worth for that safety check\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"2801dcd43937d6a4afa1f277a4aaa0a8d8be3bda"},"merged_patch":{"kind":"string","value":"diff --git a/ts/src/okx.ts b/ts/src/okx.ts\nindex d66a18cceae37..ae22ef1b9f8b2 100644\n--- a/ts/src/okx.ts\n+++ b/ts/src/okx.ts\n@@ -2146,17 +2146,14 @@ export default class okx extends Exchange {\n let defaultType = 'Candles';\n if (since !== undefined) {\n const now = this.milliseconds ();\n- const difference = now - since;\n const durationInMilliseconds = duration * 1000;\n- // if the since timestamp is more than limit candles back in the past\n- // additional one bar for max offset to round the current day to UTC\n- const calc = (1440 - limit - 1) * durationInMilliseconds;\n- if (difference > calc) {\n+ // switch to history candles if since is past the cutoff for current candles\n+ const historyBorder = now - ((1440 - 1) * durationInMilliseconds);\n+ if (since < historyBorder) {\n defaultType = 'HistoryCandles';\n }\n- const startTime = Math.max (since - 1, 0);\n- request['before'] = startTime;\n- request['after'] = this.sum (startTime, durationInMilliseconds * limit);\n+ request['before'] = since;\n+ request['after'] = this.sum (since, durationInMilliseconds * limit);\n }\n const until = this.safeInteger (params, 'until');\n if (until !== undefined) {\ndiff --git a/ts/src/test/static/request/okx.json b/ts/src/test/static/request/okx.json\nindex c6e8727c786fc..3a657fd3da65b 100644\n--- a/ts/src/test/static/request/okx.json\n+++ b/ts/src/test/static/request/okx.json\n@@ -902,6 +902,30 @@\n }\n ]\n }\n+ ],\n+ \"fetchOHLCV\": [\n+ {\n+ \"description\": \"fetchOHLCV using a timestamp that is 1439 candles in the past so that the history endpoint is used\",\n+ \"method\": \"fetchOHLCV\",\n+ \"url\": \"https://www.okx.com/api/v5/market/history-candles?instId=BTC-USDT&bar=1H&limit=300&before=1699931781033&after=1701011781033\",\n+ \"input\": [\n+ \"BTC/USDT\",\n+ \"1h\",\n+ 1699931781033,\n+ 300\n+ ]\n+ },\n+ {\n+ \"description\": \"fetchOHLCV using a timestamp that is 1438 candles in the past so that the current endpoint is used\",\n+ \"method\": \"fetchOHLCV\",\n+ \"url\": \"https://www.okx.com/api/v5/market/candles?instId=BTC-USDT&bar=1H&limit=300&before=1699935566969&after=1701015566969\",\n+ \"input\": [\n+ \"BTC/USDT\",\n+ \"1h\",\n+ 1699935566969,\n+ 300\n+ ]\n+ }\n ]\n }\n }\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2380,"cells":{"instance_id":{"kind":"string","value":"cookiecutter__cookiecutter-django-4971@bac46de"},"repo":{"kind":"string","value":"cookiecutter/cookiecutter-django"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":4971,"string":"4,971"},"title":{"kind":"string","value":"Fix `runserver_plus` hot-reload when under Windows + Docker"},"body":{"kind":"string","value":"## Description\r\nSupporting django auto reload in windows docker.\r\n\r\n## Rationale\r\nNow it doesn't reload when django code is changed in windows docker env.\r\nThe problem is related to wsl2 and Werkzeug's built-in reloading system.\r\nSo it can be fixed with stat polling options.\r\n\r\nFIX #4970 "},"created_at":{"kind":"string","value":"2024-04-06T02:54:37Z"},"problem_statement":{"kind":"string","value":"Why doesn't add RunServerPlus options for reload in windows when using docker?\n## Description\r\n\r\nWhat are you proposing? How should it be implemented?\r\n\r\nAdd this code when window = y when generating project, for reloading django code in window.\r\n\r\n```\r\nend of base.py\r\n# RunServerPlus\r\n# ------------------------------------------------------------------------------\r\n{% if cookiecutter.windows == 'y' %}\r\n# After how many seconds auto-reload should scan for updates in poller-mode\r\nRUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\r\n\r\n# Werkzeug reloader type [auto, watchdog, or stat]\r\nRUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\r\n{% endif %}\r\n```\r\n\r\n## Rationale\r\n\r\nWhy should this feature be implemented?\r\nIn window with docker, somehow(might be filesytem problem) reload doens't work with default RELOADER_TYPE.\r\nSo we should add above code but when the first time using cookiecutter, all of users don't realize what happens like me.\r\nSo it should be set by default when windows option as y in generating project step."},"hints_text":{"kind":"string","value":"This would definitely help, can you submit a PR? \n> This would definitely help, can you submit a PR? \n\nYeah. It is honor to me. I will make a pr soon. I hope you review my code. 😀"},"resolved_issues":{"kind":"list like","value":[{"body":"## Description\r\n\r\nWhat are you proposing? How should it be implemented?\r\n\r\nAdd this code when window = y when generating project, for reloading django code in window.\r\n\r\n```\r\nend of base.py\r\n# RunServerPlus\r\n# ------------------------------------------------------------------------------\r\n{% if cookiecutter.windows == 'y' %}\r\n# After how many seconds auto-reload should scan for updates in poller-mode\r\nRUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\r\n\r\n# Werkzeug reloader type [auto, watchdog, or stat]\r\nRUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\r\n{% endif %}\r\n```\r\n\r\n## Rationale\r\n\r\nWhy should this feature be implemented?\r\nIn window with docker, somehow(might be filesytem problem) reload doens't work with default RELOADER_TYPE.\r\nSo we should add above code but when the first time using cookiecutter, all of users don't realize what happens like me.\r\nSo it should be set by default when windows option as y in generating project step.","number":4970,"title":"Why doesn't add RunServerPlus options for reload in windows when using docker?"}],"string":"[\n {\n \"body\": \"## Description\\r\\n\\r\\nWhat are you proposing? How should it be implemented?\\r\\n\\r\\nAdd this code when window = y when generating project, for reloading django code in window.\\r\\n\\r\\n```\\r\\nend of base.py\\r\\n# RunServerPlus\\r\\n# ------------------------------------------------------------------------------\\r\\n{% if cookiecutter.windows == 'y' %}\\r\\n# After how many seconds auto-reload should scan for updates in poller-mode\\r\\nRUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\\r\\n\\r\\n# Werkzeug reloader type [auto, watchdog, or stat]\\r\\nRUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\\r\\n{% endif %}\\r\\n```\\r\\n\\r\\n## Rationale\\r\\n\\r\\nWhy should this feature be implemented?\\r\\nIn window with docker, somehow(might be filesytem problem) reload doens't work with default RELOADER_TYPE.\\r\\nSo we should add above code but when the first time using cookiecutter, all of users don't realize what happens like me.\\r\\nSo it should be set by default when windows option as y in generating project step.\",\n \"number\": 4970,\n \"title\": \"Why doesn't add RunServerPlus options for reload in windows when using docker?\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"83ceb39b50355d92f0f164b30f2c6fbca5ed36f2"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"bac46de67f3a829dc51921660af9a426f483a225\",\n \"head_commit_message\": \"Add options to reload django when file changes in windows docker\",\n \"patch_to_review\": \"diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py\\nindex f1edb514ba..0f36662ec0 100644\\n--- a/{{cookiecutter.project_slug}}/config/settings/local.py\\n+++ b/{{cookiecutter.project_slug}}/config/settings/local.py\\n@@ -83,6 +83,15 @@\\n # The node container isn't started (yet?)\\n pass\\n {%- endif %}\\n+{% if cookiecutter.windows == 'y' %}\\n+# RunServerPlus\\n+# ------------------------------------------------------------------------------\\n+# After how many seconds auto-reload should scan for updates in poller-mode\\n+RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\\n+\\n+# Werkzeug reloader type [auto, watchdog, or stat]\\n+RUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\\n+{% endif %}\\n {%- endif %}\\n \\n # django-extensions\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -83,6 +83,15 @@\n # The node container isn't started (yet?)\n pass\n {%- endif %}\n+{% if cookiecutter.windows == 'y' %}\n+# RunServerPlus\n+# ------------------------------------------------------------------------------\n+# After how many seconds auto-reload should scan for updates in poller-mode\n+RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5","line":null,"original_line":90,"original_start_line":null,"path":"{{cookiecutter.project_slug}}/config/settings/local.py","start_line":null,"text":"@user1:\n5 seconds seems a bit long, no? The default value of 1 second seems more appropriate:\r\n\r\n```suggestion\r\nRUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 1\r\n```\r\n\r\nActually, since it's the default interval, do we need to define it? I think we could omit it..."},{"diff_hunk":"@@ -83,6 +83,15 @@\n # The node container isn't started (yet?)\n pass\n {%- endif %}\n+{% if cookiecutter.windows == 'y' %}\n+# RunServerPlus\n+# ------------------------------------------------------------------------------\n+# After how many seconds auto-reload should scan for updates in poller-mode\n+RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\n+\n+# Werkzeug reloader type [auto, watchdog, or stat]\n+RUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\n+{% endif %}","line":null,"original_line":94,"original_start_line":null,"path":"{{cookiecutter.project_slug}}/config/settings/local.py","start_line":null,"text":"@user1:\nTo avoid leaving an extra empty line:\r\n\r\n```suggestion\r\n{%- endif %}\r\n```"},{"diff_hunk":"@@ -83,6 +83,15 @@\n # The node container isn't started (yet?)\n pass\n {%- endif %}\n+{% if cookiecutter.windows == 'y' %}","line":null,"original_line":86,"original_start_line":null,"path":"{{cookiecutter.project_slug}}/config/settings/local.py","start_line":null,"text":"@user1:\nI'm not sure it will change much in the final formatting, but I tend to add a minus sign to [trim empty lines before the Jinja tags](https://jinja.palletsprojects.com/en/2.10.x/templates/#whitespace-control), and add an explicit emtpy line after:\r\n\r\n```suggestion\r\n{%- if cookiecutter.windows == 'y' %}\r\n\r\n```\r\n\r\nI found it easier to see where the empty line will be when the codition is true or false.\n\n@author:\nYeah, it looks better. and also it should be add indent too."}],"string":"[\n {\n \"diff_hunk\": \"@@ -83,6 +83,15 @@\\n # The node container isn't started (yet?)\\n pass\\n {%- endif %}\\n+{% if cookiecutter.windows == 'y' %}\\n+# RunServerPlus\\n+# ------------------------------------------------------------------------------\\n+# After how many seconds auto-reload should scan for updates in poller-mode\\n+RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\",\n \"line\": null,\n \"original_line\": 90,\n \"original_start_line\": null,\n \"path\": \"{{cookiecutter.project_slug}}/config/settings/local.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\n5 seconds seems a bit long, no? The default value of 1 second seems more appropriate:\\r\\n\\r\\n```suggestion\\r\\nRUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 1\\r\\n```\\r\\n\\r\\nActually, since it's the default interval, do we need to define it? I think we could omit it...\"\n },\n {\n \"diff_hunk\": \"@@ -83,6 +83,15 @@\\n # The node container isn't started (yet?)\\n pass\\n {%- endif %}\\n+{% if cookiecutter.windows == 'y' %}\\n+# RunServerPlus\\n+# ------------------------------------------------------------------------------\\n+# After how many seconds auto-reload should scan for updates in poller-mode\\n+RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 5\\n+\\n+# Werkzeug reloader type [auto, watchdog, or stat]\\n+RUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\\n+{% endif %}\",\n \"line\": null,\n \"original_line\": 94,\n \"original_start_line\": null,\n \"path\": \"{{cookiecutter.project_slug}}/config/settings/local.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nTo avoid leaving an extra empty line:\\r\\n\\r\\n```suggestion\\r\\n{%- endif %}\\r\\n```\"\n },\n {\n \"diff_hunk\": \"@@ -83,6 +83,15 @@\\n # The node container isn't started (yet?)\\n pass\\n {%- endif %}\\n+{% if cookiecutter.windows == 'y' %}\",\n \"line\": null,\n \"original_line\": 86,\n \"original_start_line\": null,\n \"path\": \"{{cookiecutter.project_slug}}/config/settings/local.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nI'm not sure it will change much in the final formatting, but I tend to add a minus sign to [trim empty lines before the Jinja tags](https://jinja.palletsprojects.com/en/2.10.x/templates/#whitespace-control), and add an explicit emtpy line after:\\r\\n\\r\\n```suggestion\\r\\n{%- if cookiecutter.windows == 'y' %}\\r\\n\\r\\n```\\r\\n\\r\\nI found it easier to see where the empty line will be when the codition is true or false.\\n\\n@author:\\nYeah, it looks better. and also it should be add indent too.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"f4421a81eeeba758f2fd6a0352d2fa04be7aafcb"},"merged_patch":{"kind":"string","value":"diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py\nindex f1edb514ba..ab526f968c 100644\n--- a/{{cookiecutter.project_slug}}/config/settings/local.py\n+++ b/{{cookiecutter.project_slug}}/config/settings/local.py\n@@ -83,6 +83,15 @@\n # The node container isn't started (yet?)\n pass\n {%- endif %}\n+ {%- if cookiecutter.windows == 'y' %}\n+ # RunServerPlus\n+ # ------------------------------------------------------------------------------\n+ # This is a custom setting for RunServerPlus to fix reloader issue in Windows docker environment\n+ # Werkzeug reloader type [auto, watchdog, or stat]\n+ RUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'\n+ # If you have CPU and IO load issues, you can increase this poller interval e.g) 5\n+ RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 1\n+ {%- endif %}\n {%- endif %}\n \n # django-extensions\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"low\",\n \"estimated_review_effort\": 2,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2381,"cells":{"instance_id":{"kind":"string","value":"dmlc__dgl-6409@2f57756"},"repo":{"kind":"string","value":"dmlc/dgl"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":6409,"string":"6,409"},"title":{"kind":"string","value":"[Sparse]Fix device check "},"body":{"kind":"string","value":"## Description\r\nAdd the device check for sparse operator. When user call the function and the device of input matrix is not the same as input tensor, raise an error.\r\n\r\nResolve #6393.\r\n\r\n## Checklist\r\nPlease feel free to remove inapplicable items for your PR.\r\n- [ ] The PR title starts with [$CATEGORY] (such as [NN], [Model], [Doc], [Feature]])\r\n- [ ] I've leverage the [tools](https://docs.google.com/document/d/1iHyj7zlmygKSk5gBPsqIqL5ASPzJSPREaNT_QdsiYA4/edit) to beautify the python and c++ code.\r\n- [ ] The PR is complete and small, read the [Google eng practice (CL equals to PR)](https://google.github.io/eng-practices/review/developer/small-cls.html) to understand more about small PR. In DGL, we consider PRs with less than 200 lines of core code change are small (example, test and documentation could be exempted).\r\n- [ ] All changes have test coverage\r\n- [ ] Code is well-documented\r\n- [ ] To the best of my knowledge, examples are either not affected by this change, or have been fixed to be compatible with this change\r\n- [ ] Related issue is referred in this PR\r\n- [ ] If the PR is for a new model/paper, I've updated the example index [here](../examples/README.md).\r\n\r\n## Changes\r\n"},"created_at":{"kind":"string","value":"2023-10-09T02:21:11Z"},"problem_statement":{"kind":"string","value":"[Bug]DGL sparse run error message is incomplete\n## 🐛 Bug\r\n\r\n<!-- A clear and concise description of what the bug is. -->\r\nDGL sparse run error message is incomplete, make it hard to debug for user.\r\n\r\n## To Reproduce\r\n\r\nIn DGL sparse, the op like bsddmm needs all inputs are on the same device, howerver, if inputs are not on the same device, it won't report \"they are not on the same device\" but report Segmentation fault, it is hard to debug for user.\r\n\r\nSteps to reproduce the behavior:\r\n\r\n```\r\n>>> import torch\r\n>>> import dgl.sparse as dglsp\r\n>>> indices = torch.tensor([[1, 1, 2], [2, 3, 3]])\r\n>>> val = torch.arange(1, 4).float()\r\n>>> A = dglsp.spmatrix(indices, val, (3, 4))\r\n>>> X1 = torch.arange(0, 3 * 5 * 2).view(3, 5, 2).float() \r\n>>> X2 = torch.arange(0, 5 * 4 * 2).view(5, 4, 2).float()\r\n>>> X1 = X1.to(\"cuda:0\")\r\n>>> X2 = X2.to(\"cuda:0\")\r\n>>> dglsp.bsddmm(A, X1, X2) // A is still on the CPU\r\nSegmentation fault (core dumped)\r\n```\r\n\r\n<!-- If you have a code sample, error messages, stack traces, please provide it here as well -->\r\n\r\n## Expected behavior\r\n\r\n<!-- A clear and concise description of what you expected to happen. -->\r\nShould we add the input device check for the DGL sparse operator?"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"## 🐛 Bug\r\n\r\n<!-- A clear and concise description of what the bug is. -->\r\nDGL sparse run error message is incomplete, make it hard to debug for user.\r\n\r\n## To Reproduce\r\n\r\nIn DGL sparse, the op like bsddmm needs all inputs are on the same device, howerver, if inputs are not on the same device, it won't report \"they are not on the same device\" but report Segmentation fault, it is hard to debug for user.\r\n\r\nSteps to reproduce the behavior:\r\n\r\n```\r\n>>> import torch\r\n>>> import dgl.sparse as dglsp\r\n>>> indices = torch.tensor([[1, 1, 2], [2, 3, 3]])\r\n>>> val = torch.arange(1, 4).float()\r\n>>> A = dglsp.spmatrix(indices, val, (3, 4))\r\n>>> X1 = torch.arange(0, 3 * 5 * 2).view(3, 5, 2).float() \r\n>>> X2 = torch.arange(0, 5 * 4 * 2).view(5, 4, 2).float()\r\n>>> X1 = X1.to(\"cuda:0\")\r\n>>> X2 = X2.to(\"cuda:0\")\r\n>>> dglsp.bsddmm(A, X1, X2) // A is still on the CPU\r\nSegmentation fault (core dumped)\r\n```\r\n\r\n<!-- If you have a code sample, error messages, stack traces, please provide it here as well -->\r\n\r\n## Expected behavior\r\n\r\n<!-- A clear and concise description of what you expected to happen. -->\r\nShould we add the input device check for the DGL sparse operator? \r\n\r\n","number":6393,"title":"[Bug]DGL sparse run error message is incomplete"}],"string":"[\n {\n \"body\": \"## 🐛 Bug\\r\\n\\r\\n<!-- A clear and concise description of what the bug is. -->\\r\\nDGL sparse run error message is incomplete, make it hard to debug for user.\\r\\n\\r\\n## To Reproduce\\r\\n\\r\\nIn DGL sparse, the op like bsddmm needs all inputs are on the same device, howerver, if inputs are not on the same device, it won't report \\\"they are not on the same device\\\" but report Segmentation fault, it is hard to debug for user.\\r\\n\\r\\nSteps to reproduce the behavior:\\r\\n\\r\\n```\\r\\n>>> import torch\\r\\n>>> import dgl.sparse as dglsp\\r\\n>>> indices = torch.tensor([[1, 1, 2], [2, 3, 3]])\\r\\n>>> val = torch.arange(1, 4).float()\\r\\n>>> A = dglsp.spmatrix(indices, val, (3, 4))\\r\\n>>> X1 = torch.arange(0, 3 * 5 * 2).view(3, 5, 2).float() \\r\\n>>> X2 = torch.arange(0, 5 * 4 * 2).view(5, 4, 2).float()\\r\\n>>> X1 = X1.to(\\\"cuda:0\\\")\\r\\n>>> X2 = X2.to(\\\"cuda:0\\\")\\r\\n>>> dglsp.bsddmm(A, X1, X2) // A is still on the CPU\\r\\nSegmentation fault (core dumped)\\r\\n```\\r\\n\\r\\n<!-- If you have a code sample, error messages, stack traces, please provide it here as well -->\\r\\n\\r\\n## Expected behavior\\r\\n\\r\\n<!-- A clear and concise description of what you expected to happen. -->\\r\\nShould we add the input device check for the DGL sparse operator? \\r\\n\\r\\n\",\n \"number\": 6393,\n \"title\": \"[Bug]DGL sparse run error message is incomplete\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"fdb4737c3517380a8ffd01e743edea231c7570c5"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"2f57756c70e70a1b1a7ac69bd58b75a61934a4f7\",\n \"head_commit_message\": \"add device check in c\",\n \"patch_to_review\": \"diff --git a/dgl_sparse/src/sddmm.cc b/dgl_sparse/src/sddmm.cc\\nindex b32f1640de45..810583e01a99 100644\\n--- a/dgl_sparse/src/sddmm.cc\\n+++ b/dgl_sparse/src/sddmm.cc\\n@@ -61,8 +61,9 @@ void _SDDMMSanityCheck(\\n mat1.dtype() == mat2.dtype(),\\n \\\"SDDMM: the two dense matrices should have the same dtype.\\\");\\n TORCH_CHECK(\\n- mat1.device() == mat2.device(),\\n- \\\"SDDMM: the two dense matrices should on the same device.\\\");\\n+ mat1.device() == mat2.device() && sparse_mat->device() == mat2.device(),\\n+ \\\"SDDMM: the two dense matrices and sparse matrix should on the same \\\"\\n+ \\\"device.\\\");\\n }\\n \\n torch::Tensor SDDMMAutoGrad::forward(\\ndiff --git a/python/dgl/sparse/matmul.py b/python/dgl/sparse/matmul.py\\nindex b933339bcd0d..a664eed0649b 100644\\n--- a/python/dgl/sparse/matmul.py\\n+++ b/python/dgl/sparse/matmul.py\\n@@ -123,7 +123,6 @@ def spspmm(A: SparseMatrix, B: SparseMatrix) -> SparseMatrix:\\n assert isinstance(\\n B, SparseMatrix\\n ), f\\\"Expect A2 to be a SparseMatrix object, got {type(B)}.\\\"\\n-\\n return SparseMatrix(\\n torch.ops.dgl_sparse.spspmm(A.c_sparse_matrix, B.c_sparse_matrix)\\n )\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -123,7 +123,6 @@ def spspmm(A: SparseMatrix, B: SparseMatrix) -> SparseMatrix:\n assert isinstance(\n B, SparseMatrix\n ), f\"Expect A2 to be a SparseMatrix object, got {type(B)}.\"\n-","line":null,"original_line":126,"original_start_line":null,"path":"python/dgl/sparse/matmul.py","start_line":null,"text":"@user1:\nRemove this change."}],"string":"[\n {\n \"diff_hunk\": \"@@ -123,7 +123,6 @@ def spspmm(A: SparseMatrix, B: SparseMatrix) -> SparseMatrix:\\n assert isinstance(\\n B, SparseMatrix\\n ), f\\\"Expect A2 to be a SparseMatrix object, got {type(B)}.\\\"\\n-\",\n \"line\": null,\n \"original_line\": 126,\n \"original_start_line\": null,\n \"path\": \"python/dgl/sparse/matmul.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nRemove this change.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"b9fd04848c7dbf4e89095f079435d727186455fe"},"merged_patch":{"kind":"string","value":"diff --git a/dgl_sparse/src/sddmm.cc b/dgl_sparse/src/sddmm.cc\nindex b32f1640de45..810583e01a99 100644\n--- a/dgl_sparse/src/sddmm.cc\n+++ b/dgl_sparse/src/sddmm.cc\n@@ -61,8 +61,9 @@ void _SDDMMSanityCheck(\n mat1.dtype() == mat2.dtype(),\n \"SDDMM: the two dense matrices should have the same dtype.\");\n TORCH_CHECK(\n- mat1.device() == mat2.device(),\n- \"SDDMM: the two dense matrices should on the same device.\");\n+ mat1.device() == mat2.device() && sparse_mat->device() == mat2.device(),\n+ \"SDDMM: the two dense matrices and sparse matrix should on the same \"\n+ \"device.\");\n }\n \n torch::Tensor SDDMMAutoGrad::forward(\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"low\",\n \"estimated_review_effort\": 2,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2382,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-11020@2cb2c96"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":11020,"string":"11,020"},"title":{"kind":"string","value":"make microbatch models skippable"},"body":{"kind":"string","value":"Resolves https://github.com/dbt-labs/dbt-core/issues/11021\r\n\r\n<!---\r\n Include the number of the issue addressed by this PR above, if applicable.\r\n PRs for code changes without an associated issue *will not be merged*.\r\n See CONTRIBUTING.md for more information.\r\n\r\n Add the `user docs` label to this PR if it will need docs changes. An \r\n issue will get opened in docs.getdbt.com upon successful merge of this PR.\r\n-->\r\n\r\n### Problem\r\n\r\n<!---\r\n Describe the problem this PR is solving. What is the application state\r\n before this PR is merged?\r\n-->\r\n\r\n1. Skipping microbatch model fails with typeError: object of type 'Field' has no len()\r\n2. That codepath indicates the microbatch model is still running in some capacity\r\n\r\n### Solution\r\n\r\n<!---\r\n Describe the way this PR solves the above problem. Add as much detail as you\r\n can to help reviewers understand your changes. Include any alternatives and\r\n tradeoffs you considered.\r\n-->\r\n\r\n1. Stop using `field(default_factory=...)` outside a dataclass (MicrobatchModelRunner)\r\n2. Return results early if initial microbatch run results in a skipped result\r\n\r\n### Checklist\r\n\r\n- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me.\r\n- [x] I have run this code in development, and it appears to resolve the stated issue.\r\n- [x] This PR includes tests, or tests are not required or relevant for this PR.\r\n- [x] This PR has no interface changes (e.g., macros, CLI, logs, JSON artifacts, config files, adapter interface, etc.) or this PR has already received feedback and approval from Product or DX.\r\n- [x] This PR includes [type annotations](https://docs.python.org/3/library/typing.html) for new and modified functions.\r\n\r\n\r\n🎩 \r\n```sh\r\nInvoking dbt with ['run']\r\n16:21:04 Running with dbt=1.9.0-b4\r\n16:21:04 Registered adapter: postgres=1.9.0-b1\r\n16:21:04 Unable to do partial parsing because saved manifest not found. Starting full parse.\r\n16:21:05 Found 2 models, 429 macros\r\n16:21:05 \r\n16:21:05 Concurrency: 4 threads (target='default')\r\n16:21:05 \r\n16:21:05 1 of 2 START sql table model test17322060642773181458_test_microbatch.input_model [RUN]\r\n16:21:05 1 of 2 ERROR creating sql table model test17322060642773181458_test_microbatch.input_model [ERROR in 0.05s]\r\n16:21:05 2 of 2 SKIP relation test17322060642773181458_test_microbatch.microbatch_model . [SKIP]\r\n16:21:05 \r\n16:21:05 Finished running 1 incremental model, 1 table model in 0 hours 0 minutes and 0.55 seconds (0.55s).\r\n16:21:05 \r\n16:21:05 Completed with 1 error, 0 partial successs, and 0 warnings:\r\n16:21:05 \r\n16:21:05 Database Error in model input_model (models/input_model.sql)\r\n column \"invalid\" does not exist\r\n LINE 14: select invalid as event_time\r\n ^\r\n compiled code at target/run/test/models/input_model.sql\r\n16:21:05 \r\n```\r\n\r\n(extra '.' in skip result is a general issue, not just for microbatch models)"},"created_at":{"kind":"string","value":"2024-11-21T16:22:02Z"},"problem_statement":{"kind":"string","value":"[Bug] Skipping microbatch model fails with `typeError: object of type 'Field' has no len()`\nAn upstream failing leads to a microbatch model skipping (but still executing?) with the failure 'Field' has no len():\r\n\r\n```\r\n15:47:30 Found 23 models, 6 seeds, 21 data tests, 6 sources, 2 exposures, 13 metrics, 769 macros, 6 semantic models, 5 unit tests\r\n15:47:30 \r\n15:47:30 Concurrency: 4 threads (target='default')\r\n15:47:30 \r\n15:47:32 1 of 2 START sql view model dbt_marky.microbatch_input ......................... [RUN]\r\n15:47:33 1 of 2 ERROR creating sql view model dbt_marky.microbatch_input ................ [ERROR in 0.69s]\r\n15:47:33 2 of 2 SKIP relation dbt_marky.microbatch ...................................... [SKIP]\r\n> /Users/michelleark/src/dbt-core/core/dbt/task/run.py(715)handle_microbatch_model()\r\n-> while batch_idx < len(runner.batches):\r\n(Pdb) runner.batches\r\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\r\n(Pdb) field(default_factory=dict)\r\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\r\n(Pdb) field(default_factory=dict)\r\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\r\n(Pdb) len(field(default_factory=dict))\r\n```"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"An upstream failing leads to a microbatch model skipping (but still executing?) with the failure 'Field' has no len():\r\n\r\n```\r\n15:47:30 Found 23 models, 6 seeds, 21 data tests, 6 sources, 2 exposures, 13 metrics, 769 macros, 6 semantic models, 5 unit tests\r\n15:47:30 \r\n15:47:30 Concurrency: 4 threads (target='default')\r\n15:47:30 \r\n15:47:32 1 of 2 START sql view model dbt_marky.microbatch_input ......................... [RUN]\r\n15:47:33 1 of 2 ERROR creating sql view model dbt_marky.microbatch_input ................ [ERROR in 0.69s]\r\n15:47:33 2 of 2 SKIP relation dbt_marky.microbatch ...................................... [SKIP]\r\n> /Users/michelleark/src/dbt-core/core/dbt/task/run.py(715)handle_microbatch_model()\r\n-> while batch_idx < len(runner.batches):\r\n(Pdb) runner.batches\r\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\r\n(Pdb) field(default_factory=dict)\r\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\r\n(Pdb) field(default_factory=dict)\r\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\r\n(Pdb) len(field(default_factory=dict))\r\n```","number":11021,"title":"[Bug] Skipping microbatch model fails with `typeError: object of type 'Field' has no len()`"}],"string":"[\n {\n \"body\": \"An upstream failing leads to a microbatch model skipping (but still executing?) with the failure 'Field' has no len():\\r\\n\\r\\n```\\r\\n15:47:30 Found 23 models, 6 seeds, 21 data tests, 6 sources, 2 exposures, 13 metrics, 769 macros, 6 semantic models, 5 unit tests\\r\\n15:47:30 \\r\\n15:47:30 Concurrency: 4 threads (target='default')\\r\\n15:47:30 \\r\\n15:47:32 1 of 2 START sql view model dbt_marky.microbatch_input ......................... [RUN]\\r\\n15:47:33 1 of 2 ERROR creating sql view model dbt_marky.microbatch_input ................ [ERROR in 0.69s]\\r\\n15:47:33 2 of 2 SKIP relation dbt_marky.microbatch ...................................... [SKIP]\\r\\n> /Users/michelleark/src/dbt-core/core/dbt/task/run.py(715)handle_microbatch_model()\\r\\n-> while batch_idx < len(runner.batches):\\r\\n(Pdb) runner.batches\\r\\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\\r\\n(Pdb) field(default_factory=dict)\\r\\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\\r\\n(Pdb) field(default_factory=dict)\\r\\nField(name=None,type=None,default=<dataclasses._MISSING_TYPE object at 0x100efa230>,default_factory=<class 'dict'>,init=True,repr=True,hash=None,compare=True,metadata=mappingproxy({}),kw_only=<dataclasses._MISSING_TYPE object at 0x100efa230>,_field_type=None)\\r\\n(Pdb) len(field(default_factory=dict))\\r\\n```\",\n \"number\": 11021,\n \"title\": \"[Bug] Skipping microbatch model fails with `typeError: object of type 'Field' has no len()`\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"fd6ec71dabae91f4f243362acbcda6dc1beccec6"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"2cb2c96a18735f66e0fbf70d7472fc19c8b14586\",\n \"head_commit_message\": \"make microbatch models skippable\",\n \"patch_to_review\": \"diff --git a/core/dbt/task/run.py b/core/dbt/task/run.py\\nindex 1b4be463e78..0b991fc9f29 100644\\n--- a/core/dbt/task/run.py\\n+++ b/core/dbt/task/run.py\\n@@ -2,7 +2,7 @@\\n import threading\\n import time\\n from copy import deepcopy\\n-from dataclasses import asdict, field\\n+from dataclasses import asdict\\n from datetime import datetime\\n from multiprocessing.pool import ThreadPool\\n from typing import AbstractSet, Any, Dict, Iterable, List, Optional, Set, Tuple, Type\\n@@ -335,7 +335,7 @@ def execute(self, model, manifest):\\n \\n class MicrobatchModelRunner(ModelRunner):\\n batch_idx: Optional[int] = None\\n- batches: Dict[int, BatchType] = field(default_factory=dict)\\n+ batches: Dict[int, BatchType] = {}\\n relation_exists: bool = False\\n \\n def set_batch_idx(self, batch_idx: int) -> None:\\n@@ -704,8 +704,11 @@ def handle_microbatch_model(\\n runner: MicrobatchModelRunner,\\n pool: ThreadPool,\\n ) -> RunResult:\\n- # Initial run computes batch metadata\\n+ # Initial run computes batch metadata, unless model is skipped\\n result = self.call_runner(runner)\\n+ if result.status == RunStatus.Skipped:\\n+ return result\\n+\\n batch_results: List[RunResult] = []\\n \\n # Execute batches serially until a relation exists, at which point future batches are run in parallel\\ndiff --git a/tests/functional/microbatch/test_microbatch.py b/tests/functional/microbatch/test_microbatch.py\\nindex c9b9db2ff4e..ddac8959a5a 100644\\n--- a/tests/functional/microbatch/test_microbatch.py\\n+++ b/tests/functional/microbatch/test_microbatch.py\\n@@ -33,6 +33,12 @@\\n select 3 as id, TIMESTAMP '2020-01-03 00:00:00-0' as event_time\\n \\\"\\\"\\\"\\n \\n+input_model_invalid_sql = \\\"\\\"\\\"\\n+{{ config(materialized='table', event_time='event_time') }}\\n+\\n+select invalid as event_time\\n+\\\"\\\"\\\"\\n+\\n input_model_without_event_time_sql = \\\"\\\"\\\"\\n {{ config(materialized='table') }}\\n \\n@@ -835,6 +841,24 @@ def test_microbatch(\\n assert len(catch_aw.caught_events) == 1\\n \\n \\n+class TestMicrobatchModelSkipped(BaseMicrobatchTest):\\n+ @pytest.fixture(scope=\\\"class\\\")\\n+ def models(self):\\n+ return {\\n+ \\\"input_model.sql\\\": input_model_invalid_sql,\\n+ \\\"microbatch_model.sql\\\": microbatch_model_sql,\\n+ }\\n+\\n+ def test_microbatch_model_skipped(self, project) -> None:\\n+ run_dbt([\\\"run\\\"], expect_pass=False)\\n+\\n+ run_results = get_artifact(project.project_root, \\\"target\\\", \\\"run_results.json\\\")\\n+\\n+ microbatch_result = run_results[\\\"results\\\"][1]\\n+ assert microbatch_result[\\\"status\\\"] == \\\"skipped\\\"\\n+ assert microbatch_result[\\\"batch_results\\\"] is None\\n+\\n+\\n class TestMicrobatchCanRunParallelOrSequential(BaseMicrobatchTest):\\n @pytest.fixture\\n def batch_exc_catcher(self) -> EventCatcher:\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -335,7 +335,7 @@ def execute(self, model, manifest):\n \n class MicrobatchModelRunner(ModelRunner):\n batch_idx: Optional[int] = None\n- batches: Dict[int, BatchType] = field(default_factory=dict)","line":338,"original_line":338,"original_start_line":null,"path":"core/dbt/task/run.py","start_line":null,"text":"@author:\nUsage of `field(default_factory=...)` was invalid outside of a dataclass\n\n@user1:\nHave we verified that having it set as `batches: Dict[int, BatchType] = {}` doesn't make it so two instances of `MicrobatchModelRunner` share the same underlying dict?\n\n@user1:\nDid a test. We do indeed need to do something different\r\n```\r\n>>> class MyClass:\r\n... batches = {}\r\n... \r\n>>> instance1 = MyClass()\r\n>>> instance2 = MyClass()\r\n>>> instance1.batches\r\n{}\r\n>>> instance2.batches\r\n{}\r\n>>> instance1.batches['catch_phrase'] = \"I like cats!\"\r\n>>> instance1.batches\r\n{'catch_phrase': 'I like cats!'}\r\n>>> instance2.batches\r\n{'catch_phrase': 'I like cats!'}\r\n```\n\n@author:\nGood call. Fixed with __init__ override:\r\n\r\n```sh\r\n>>> class MyClass:\r\n... def __init__(self):\r\n... self.batches = {}\r\n...\r\n>>> instance1 = MyClass()\r\n>>> instance2 = MyClass()\r\n>>> instance1.batches\r\n{}\r\n>>> instance2.batches\r\n{}\r\n>>> instance1.batches['catch_phrase'] = \"I like cats!\"\r\n>>> instance1.batches\r\n{'catch_phrase': 'I like cats!'}\r\n>>> instance2.batches\r\n{}\r\n>>>\r\n```"}],"string":"[\n {\n \"diff_hunk\": \"@@ -335,7 +335,7 @@ def execute(self, model, manifest):\\n \\n class MicrobatchModelRunner(ModelRunner):\\n batch_idx: Optional[int] = None\\n- batches: Dict[int, BatchType] = field(default_factory=dict)\",\n \"line\": 338,\n \"original_line\": 338,\n \"original_start_line\": null,\n \"path\": \"core/dbt/task/run.py\",\n \"start_line\": null,\n \"text\": \"@author:\\nUsage of `field(default_factory=...)` was invalid outside of a dataclass\\n\\n@user1:\\nHave we verified that having it set as `batches: Dict[int, BatchType] = {}` doesn't make it so two instances of `MicrobatchModelRunner` share the same underlying dict?\\n\\n@user1:\\nDid a test. We do indeed need to do something different\\r\\n```\\r\\n>>> class MyClass:\\r\\n... batches = {}\\r\\n... \\r\\n>>> instance1 = MyClass()\\r\\n>>> instance2 = MyClass()\\r\\n>>> instance1.batches\\r\\n{}\\r\\n>>> instance2.batches\\r\\n{}\\r\\n>>> instance1.batches['catch_phrase'] = \\\"I like cats!\\\"\\r\\n>>> instance1.batches\\r\\n{'catch_phrase': 'I like cats!'}\\r\\n>>> instance2.batches\\r\\n{'catch_phrase': 'I like cats!'}\\r\\n```\\n\\n@author:\\nGood call. Fixed with __init__ override:\\r\\n\\r\\n```sh\\r\\n>>> class MyClass:\\r\\n... def __init__(self):\\r\\n... self.batches = {}\\r\\n...\\r\\n>>> instance1 = MyClass()\\r\\n>>> instance2 = MyClass()\\r\\n>>> instance1.batches\\r\\n{}\\r\\n>>> instance2.batches\\r\\n{}\\r\\n>>> instance1.batches['catch_phrase'] = \\\"I like cats!\\\"\\r\\n>>> instance1.batches\\r\\n{'catch_phrase': 'I like cats!'}\\r\\n>>> instance2.batches\\r\\n{}\\r\\n>>>\\r\\n```\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"052d699ff31651f833a434a352f8247662cc4ac7"},"merged_patch":{"kind":"string","value":"diff --git a/.changes/unreleased/Fixes-20241121-112638.yaml b/.changes/unreleased/Fixes-20241121-112638.yaml\nnew file mode 100644\nindex 00000000000..15a23ae8995\n--- /dev/null\n+++ b/.changes/unreleased/Fixes-20241121-112638.yaml\n@@ -0,0 +1,6 @@\n+kind: Fixes\n+body: Make microbatch models skippable\n+time: 2024-11-21T11:26:38.192345-05:00\n+custom:\n+ Author: michelleark\n+ Issue: \"11021\"\ndiff --git a/core/dbt/task/run.py b/core/dbt/task/run.py\nindex 1b4be463e78..0c2888bb325 100644\n--- a/core/dbt/task/run.py\n+++ b/core/dbt/task/run.py\n@@ -2,7 +2,7 @@\n import threading\n import time\n from copy import deepcopy\n-from dataclasses import asdict, field\n+from dataclasses import asdict\n from datetime import datetime\n from multiprocessing.pool import ThreadPool\n from typing import AbstractSet, Any, Dict, Iterable, List, Optional, Set, Tuple, Type\n@@ -334,9 +334,12 @@ def execute(self, model, manifest):\n \n \n class MicrobatchModelRunner(ModelRunner):\n- batch_idx: Optional[int] = None\n- batches: Dict[int, BatchType] = field(default_factory=dict)\n- relation_exists: bool = False\n+ def __init__(self, config, adapter, node, node_index: int, num_nodes: int):\n+ super().__init__(config, adapter, node, node_index, num_nodes)\n+\n+ self.batch_idx: Optional[int] = None\n+ self.batches: Dict[int, BatchType] = {}\n+ self.relation_exists: bool = False\n \n def set_batch_idx(self, batch_idx: int) -> None:\n self.batch_idx = batch_idx\n@@ -704,8 +707,11 @@ def handle_microbatch_model(\n runner: MicrobatchModelRunner,\n pool: ThreadPool,\n ) -> RunResult:\n- # Initial run computes batch metadata\n+ # Initial run computes batch metadata, unless model is skipped\n result = self.call_runner(runner)\n+ if result.status == RunStatus.Skipped:\n+ return result\n+\n batch_results: List[RunResult] = []\n \n # Execute batches serially until a relation exists, at which point future batches are run in parallel\ndiff --git a/tests/functional/microbatch/test_microbatch.py b/tests/functional/microbatch/test_microbatch.py\nindex c9b9db2ff4e..ddac8959a5a 100644\n--- a/tests/functional/microbatch/test_microbatch.py\n+++ b/tests/functional/microbatch/test_microbatch.py\n@@ -33,6 +33,12 @@\n select 3 as id, TIMESTAMP '2020-01-03 00:00:00-0' as event_time\n \"\"\"\n \n+input_model_invalid_sql = \"\"\"\n+{{ config(materialized='table', event_time='event_time') }}\n+\n+select invalid as event_time\n+\"\"\"\n+\n input_model_without_event_time_sql = \"\"\"\n {{ config(materialized='table') }}\n \n@@ -835,6 +841,24 @@ def test_microbatch(\n assert len(catch_aw.caught_events) == 1\n \n \n+class TestMicrobatchModelSkipped(BaseMicrobatchTest):\n+ @pytest.fixture(scope=\"class\")\n+ def models(self):\n+ return {\n+ \"input_model.sql\": input_model_invalid_sql,\n+ \"microbatch_model.sql\": microbatch_model_sql,\n+ }\n+\n+ def test_microbatch_model_skipped(self, project) -> None:\n+ run_dbt([\"run\"], expect_pass=False)\n+\n+ run_results = get_artifact(project.project_root, \"target\", \"run_results.json\")\n+\n+ microbatch_result = run_results[\"results\"][1]\n+ assert microbatch_result[\"status\"] == \"skipped\"\n+ assert microbatch_result[\"batch_results\"] is None\n+\n+\n class TestMicrobatchCanRunParallelOrSequential(BaseMicrobatchTest):\n @pytest.fixture\n def batch_exc_catcher(self) -> EventCatcher:\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2383,"cells":{"instance_id":{"kind":"string","value":"dask__dask-7473@4b154b0"},"repo":{"kind":"string","value":"dask/dask"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":7473,"string":"7,473"},"title":{"kind":"string","value":"Add ignore_order parameter in dd.concat (#7398)"},"body":{"kind":"string","value":"- Closes #7398\r\n- Tests added / passed\r\n- Passes `black dask` / `flake8 dask`\r\n"},"created_at":{"kind":"string","value":"2021-03-26T21:09:50Z"},"problem_statement":{"kind":"string","value":"add \"ignore_order\" parameter for categoricals in dd.concat\nit would be handy to have a passthrough parameter to dd.concat - currently the union_categoricals call is parameter-free:\r\n\r\n```\r\n dtype = \"category\"\r\n if left is not None and right is not None:\r\n dtype = union_categoricals(\r\n [left.astype(\"category\").values, right.astype(\"category\").values]\r\n ).dtype\r\n```\r\n\r\nThis can be made more flexible as follows from the pandas docs ( I believe, though I know there are details to how dask is handling categoricals vs pandas )\r\n\r\n```\r\nIn [1]: a = pd.Categorical([\"a\", \"b\"], ordered=True)\r\nIn [2]: b = pd.Categorical([\"a\", \"b\", \"c\"], ordered=True)\r\nIn [3]: union_categoricals([a, b])\r\nOut[3]:\r\nTypeError: to union ordered Categoricals, all categories must be the same\r\n```\r\n\r\n```\r\nIn [171]: a = pd.Categorical([\"a\", \"b\", \"c\"], ordered=True)\r\nIn [172]: b = pd.Categorical([\"c\", \"b\", \"a\"], ordered=True)\r\nIn [173]: union_categoricals([a, b], ignore_order=True)\r\nOut[173]: \r\n[a, b, c, c, b, a]\r\nCategories (3, object): [a, b, c]\r\n```"},"hints_text":{"kind":"string","value":"That sounds like a nice addition, thanks for writing it up! If you have time to work on a pull request, that is the best and quickest way to get this feature :)\nCan i work on this ?\nI see two options - \r\n\r\n```\r\n@concat_dispatch.register((pd.DataFrame, pd.Series, pd.Index)) \r\ndef concat_pandas( \r\n dfs, \r\n axis=0, \r\n join=\"outer\", \r\n uniform=False, \r\n filter_warning=True, \r\n ignore_index=False, \r\n **kwargs \r\n): \r\n```\r\n\r\nHere kwargs is passed through, and so we could add a check -\r\n\r\n```\r\nignore_order = kwargs['ignore_order'] if 'ignore_order' in kwargs else False\r\n```\r\n\r\nwhere False is the pandas default.\r\n\r\nOr alternatively, we explicitly daisy chain the ignore_order argument down through the functions and use directly.\r\n\r\nThoughts?\r\n\r\n\n@gsc2001 Are you working on this?\nAnyone can work on this, no need to ask. Just open a PR that references this issue."},"resolved_issues":{"kind":"list like","value":[{"body":"it would be handy to have a passthrough parameter to dd.concat - currently the union_categoricals call is parameter-free:\r\n\r\n```\r\n dtype = \"category\"\r\n if left is not None and right is not None:\r\n dtype = union_categoricals(\r\n [left.astype(\"category\").values, right.astype(\"category\").values]\r\n ).dtype\r\n```\r\n\r\nThis can be made more flexible as follows from the pandas docs ( I believe, though I know there are details to how dask is handling categoricals vs pandas )\r\n\r\n```\r\nIn [1]: a = pd.Categorical([\"a\", \"b\"], ordered=True)\r\nIn [2]: b = pd.Categorical([\"a\", \"b\", \"c\"], ordered=True)\r\nIn [3]: union_categoricals([a, b])\r\nOut[3]:\r\nTypeError: to union ordered Categoricals, all categories must be the same\r\n```\r\n\r\n```\r\nIn [171]: a = pd.Categorical([\"a\", \"b\", \"c\"], ordered=True)\r\nIn [172]: b = pd.Categorical([\"c\", \"b\", \"a\"], ordered=True)\r\nIn [173]: union_categoricals([a, b], ignore_order=True)\r\nOut[173]: \r\n[a, b, c, c, b, a]\r\nCategories (3, object): [a, b, c]\r\n```","number":7398,"title":"add \"ignore_order\" parameter for categoricals in dd.concat"}],"string":"[\n {\n \"body\": \"it would be handy to have a passthrough parameter to dd.concat - currently the union_categoricals call is parameter-free:\\r\\n\\r\\n```\\r\\n dtype = \\\"category\\\"\\r\\n if left is not None and right is not None:\\r\\n dtype = union_categoricals(\\r\\n [left.astype(\\\"category\\\").values, right.astype(\\\"category\\\").values]\\r\\n ).dtype\\r\\n```\\r\\n\\r\\nThis can be made more flexible as follows from the pandas docs ( I believe, though I know there are details to how dask is handling categoricals vs pandas )\\r\\n\\r\\n```\\r\\nIn [1]: a = pd.Categorical([\\\"a\\\", \\\"b\\\"], ordered=True)\\r\\nIn [2]: b = pd.Categorical([\\\"a\\\", \\\"b\\\", \\\"c\\\"], ordered=True)\\r\\nIn [3]: union_categoricals([a, b])\\r\\nOut[3]:\\r\\nTypeError: to union ordered Categoricals, all categories must be the same\\r\\n```\\r\\n\\r\\n```\\r\\nIn [171]: a = pd.Categorical([\\\"a\\\", \\\"b\\\", \\\"c\\\"], ordered=True)\\r\\nIn [172]: b = pd.Categorical([\\\"c\\\", \\\"b\\\", \\\"a\\\"], ordered=True)\\r\\nIn [173]: union_categoricals([a, b], ignore_order=True)\\r\\nOut[173]: \\r\\n[a, b, c, c, b, a]\\r\\nCategories (3, object): [a, b, c]\\r\\n```\",\n \"number\": 7398,\n \"title\": \"add \\\"ignore_order\\\" parameter for categoricals in dd.concat\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"fba94e65e6053163fd1b1ed3c1803ab4f4aa541f"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"4b154b0740b11e40d4a44f8727798189761fd924\",\n \"head_commit_message\": \"Add ignore_order parameter in dd.concat (#7398)\",\n \"patch_to_review\": \"diff --git a/dask/dataframe/methods.py b/dask/dataframe/methods.py\\nindex 7c47d443c9a..2798c099c61 100644\\n--- a/dask/dataframe/methods.py\\n+++ b/dask/dataframe/methods.py\\n@@ -398,6 +398,7 @@ def concat(\\n join=\\\"outer\\\",\\n uniform=False,\\n filter_warning=True,\\n+ ignore_order=False,\\n ignore_index=False,\\n **kwargs\\n ):\\n@@ -416,8 +417,11 @@ def concat(\\n True if all arguments have the same columns and dtypes (but not\\n necessarily categories). Default is False.\\n ignore_index : bool, optional\\n- Whether to allow index values to be ignored/droped during\\n+ Whether to allow index values to be ignored/dropped during\\n concatenation. Default is False.\\n+ ignore_order : bool, optional\\n+ Whether to ignore the order when doing the union of categoricals.\\n+ Default is False.\\n \\\"\\\"\\\"\\n if len(dfs) == 1:\\n return dfs[0]\\n@@ -430,6 +434,7 @@ def concat(\\n uniform=uniform,\\n filter_warning=filter_warning,\\n ignore_index=ignore_index,\\n+ ignore_order=ignore_order,\\n **kwargs\\n )\\n \\n@@ -441,6 +446,7 @@ def concat_pandas(\\n join=\\\"outer\\\",\\n uniform=False,\\n filter_warning=True,\\n+ ignore_order=False,\\n ignore_index=False,\\n **kwargs\\n ):\\n@@ -453,7 +459,9 @@ def concat_pandas(\\n for i in range(1, len(dfs)):\\n if not isinstance(dfs[i], pd.CategoricalIndex):\\n dfs[i] = dfs[i].astype(\\\"category\\\")\\n- return pd.CategoricalIndex(union_categoricals(dfs), name=dfs[0].name)\\n+ return pd.CategoricalIndex(\\n+ union_categoricals(dfs, ignore_order=ignore_order), name=dfs[0].name\\n+ )\\n elif isinstance(dfs[0], pd.MultiIndex):\\n first, rest = dfs[0], dfs[1:]\\n if all(\\n@@ -545,7 +553,7 @@ def concat_pandas(\\n codes, sample.cat.categories, sample.cat.ordered\\n )\\n parts.append(data)\\n- out[col] = union_categoricals(parts)\\n+ out[col] = union_categoricals(parts, ignore_order=ignore_order)\\n # Pandas resets index type on assignment if frame is empty\\n # https://github.com/pandas-dev/pandas/issues/17101\\n if not len(temp_ind):\\n@@ -562,7 +570,11 @@ def concat_pandas(\\n if is_categorical_dtype(dfs2[0].dtype):\\n if ind is None:\\n ind = concat([df.index for df in dfs2])\\n- return pd.Series(union_categoricals(dfs2), index=ind, name=dfs2[0].name)\\n+ return pd.Series(\\n+ union_categoricals(dfs2, ignore_order=ignore_order),\\n+ index=ind,\\n+ name=dfs2[0].name,\\n+ )\\n with warnings.catch_warnings():\\n if filter_warning:\\n warnings.simplefilter(\\\"ignore\\\", FutureWarning)\\ndiff --git a/dask/dataframe/multi.py b/dask/dataframe/multi.py\\nindex dc472567fb1..6e925931fab 100644\\n--- a/dask/dataframe/multi.py\\n+++ b/dask/dataframe/multi.py\\n@@ -956,31 +956,38 @@ def merge_asof(\\n ###############################################################\\n \\n \\n-def concat_and_check(dfs):\\n+def concat_and_check(dfs, ignore_order=False):\\n if len(set(map(len, dfs))) != 1:\\n raise ValueError(\\\"Concatenated DataFrames of different lengths\\\")\\n- return methods.concat(dfs, axis=1)\\n+ return methods.concat(dfs, ignore_order=ignore_order, axis=1)\\n \\n \\n-def concat_unindexed_dataframes(dfs, **kwargs):\\n+def concat_unindexed_dataframes(dfs, ignore_order=False, **kwargs):\\n name = \\\"concat-\\\" + tokenize(*dfs)\\n \\n dsk = {\\n- (name, i): (concat_and_check, [(df._name, i) for df in dfs])\\n+ (name, i): (concat_and_check, [(df._name, i) for df in dfs], ignore_order)\\n for i in range(dfs[0].npartitions)\\n }\\n \\n- meta = methods.concat([df._meta for df in dfs], axis=1, **kwargs)\\n+ meta = methods.concat(\\n+ [df._meta for df in dfs], axis=1, ignore_order=ignore_order, **kwargs\\n+ )\\n \\n graph = HighLevelGraph.from_collections(name, dsk, dependencies=dfs)\\n return new_dd_object(graph, name, meta, dfs[0].divisions)\\n \\n \\n-def concat_indexed_dataframes(dfs, axis=0, join=\\\"outer\\\", **kwargs):\\n+def concat_indexed_dataframes(dfs, axis=0, join=\\\"outer\\\", ignore_order=False, **kwargs):\\n \\\"\\\"\\\" Concatenate indexed dataframes together along the index \\\"\\\"\\\"\\n warn = axis != 0\\n meta = methods.concat(\\n- [df._meta for df in dfs], axis=axis, join=join, filter_warning=warn, **kwargs\\n+ [df._meta for df in dfs],\\n+ axis=axis,\\n+ join=join,\\n+ filter_warning=warn,\\n+ ignore_order=ignore_order,\\n+ **kwargs,\\n )\\n empties = [strip_unknown_categories(df._meta) for df in dfs]\\n \\n@@ -997,7 +1004,10 @@ def concat_indexed_dataframes(dfs, axis=0, join=\\\"outer\\\", **kwargs):\\n uniform = False\\n \\n dsk = dict(\\n- ((name, i), (methods.concat, part, axis, join, uniform, filter_warning))\\n+ (\\n+ (name, i),\\n+ (methods.concat, part, axis, join, uniform, filter_warning, ignore_order),\\n+ )\\n for i, part in enumerate(parts2)\\n )\\n for df in dfs2:\\n@@ -1006,13 +1016,17 @@ def concat_indexed_dataframes(dfs, axis=0, join=\\\"outer\\\", **kwargs):\\n return new_dd_object(dsk, name, meta, divisions)\\n \\n \\n-def stack_partitions(dfs, divisions, join=\\\"outer\\\", **kwargs):\\n+def stack_partitions(dfs, divisions, join=\\\"outer\\\", ignore_order=False, **kwargs):\\n \\\"\\\"\\\"Concatenate partitions on axis=0 by doing a simple stack\\\"\\\"\\\"\\n # Use _meta_nonempty as pandas.concat will incorrectly cast float to datetime\\n # for empty data frames. See https://github.com/pandas-dev/pandas/issues/32934.\\n meta = make_meta(\\n methods.concat(\\n- [df._meta_nonempty for df in dfs], join=join, filter_warning=False, **kwargs\\n+ [df._meta_nonempty for df in dfs],\\n+ join=join,\\n+ filter_warning=False,\\n+ ignore_order=ignore_order,\\n+ **kwargs,\\n )\\n )\\n empty = strip_unknown_categories(meta)\\n@@ -1054,11 +1068,22 @@ def stack_partitions(dfs, divisions, join=\\\"outer\\\", **kwargs):\\n except (ValueError, TypeError):\\n match = False\\n \\n+ filter_warning = True\\n+ uniform = False\\n+\\n for key in df.__dask_keys__():\\n if match:\\n dsk[(name, i)] = key\\n else:\\n- dsk[(name, i)] = (methods.concat, [empty, key], 0, join)\\n+ dsk[(name, i)] = (\\n+ methods.concat,\\n+ [empty, key],\\n+ 0,\\n+ join,\\n+ uniform,\\n+ filter_warning,\\n+ ignore_order,\\n+ )\\n i += 1\\n \\n return new_dd_object(dsk, name, meta, divisions)\\n@@ -1070,6 +1095,7 @@ def concat(\\n join=\\\"outer\\\",\\n interleave_partitions=False,\\n ignore_unknown_divisions=False,\\n+ ignore_order=False,\\n **kwargs,\\n ):\\n \\\"\\\"\\\"Concatenate DataFrames along rows.\\n@@ -1103,6 +1129,8 @@ def concat(\\n ignore_unknown_divisions : bool, default False\\n By default a warning is raised if any input has unknown divisions.\\n Set to True to disable this warning.\\n+ ignore_order : bool, default False\\n+ Wether to ignore order when doing the union of categoricals.\\n \\n Notes\\n -----\\n@@ -1180,7 +1208,9 @@ def concat(\\n \\n if axis == 1:\\n if all(df.known_divisions for df in dasks):\\n- return concat_indexed_dataframes(dfs, axis=axis, join=join, **kwargs)\\n+ return concat_indexed_dataframes(\\n+ dfs, axis=axis, join=join, ignore_order=ignore_order, **kwargs\\n+ )\\n elif (\\n len(dasks) == len(dfs)\\n and all(not df.known_divisions for df in dfs)\\n@@ -1193,7 +1223,7 @@ def concat(\\n \\\" are \\\\n aligned. This assumption is not generally \\\"\\n \\\"safe.\\\"\\n )\\n- return concat_unindexed_dataframes(dfs, **kwargs)\\n+ return concat_unindexed_dataframes(dfs, ignore_order=ignore_order, **kwargs)\\n else:\\n raise ValueError(\\n \\\"Unable to concatenate DataFrame with unknown \\\"\\n@@ -1211,15 +1241,23 @@ def concat(\\n # remove last to concatenate with next\\n divisions += df.divisions[:-1]\\n divisions += dfs[-1].divisions\\n- return stack_partitions(dfs, divisions, join=join, **kwargs)\\n+ return stack_partitions(\\n+ dfs, divisions, join=join, ignore_order=ignore_order, **kwargs\\n+ )\\n elif interleave_partitions:\\n- return concat_indexed_dataframes(dfs, join=join, **kwargs)\\n+ return concat_indexed_dataframes(\\n+ dfs, join=join, ignore_order=ignore_order, **kwargs\\n+ )\\n else:\\n divisions = [None] * (sum([df.npartitions for df in dfs]) + 1)\\n- return stack_partitions(dfs, divisions, join=join, **kwargs)\\n+ return stack_partitions(\\n+ dfs, divisions, join=join, ignore_order=ignore_order, **kwargs\\n+ )\\n else:\\n divisions = [None] * (sum([df.npartitions for df in dfs]) + 1)\\n- return stack_partitions(dfs, divisions, join=join, **kwargs)\\n+ return stack_partitions(\\n+ dfs, divisions, join=join, ignore_order=ignore_order, **kwargs\\n+ )\\n \\n \\n def _contains_index_name(df, columns_or_index):\\ndiff --git a/dask/dataframe/tests/test_multi.py b/dask/dataframe/tests/test_multi.py\\nindex 5bd8e108cca..d4f5ddc09b1 100644\\n--- a/dask/dataframe/tests/test_multi.py\\n+++ b/dask/dataframe/tests/test_multi.py\\n@@ -2143,6 +2143,25 @@ def test_groupby_concat_cudf(engine):\\n assert_eq(res_dd.compute().sort_index(), res.sort_index())\\n \\n \\n+def test_concat_ignore_order():\\n+ pdf1 = pd.DataFrame(\\n+ {\\n+ \\\"x\\\": pd.Categorical(\\n+ [\\\"a\\\", \\\"b\\\", \\\"c\\\", \\\"a\\\"], categories=[\\\"a\\\", \\\"b\\\", \\\"c\\\"], ordered=True\\n+ )\\n+ }\\n+ )\\n+ ddf1 = dd.from_pandas(pdf1, 2)\\n+ pdf2 = pd.DataFrame(\\n+ {\\\"x\\\": pd.Categorical([\\\"c\\\", \\\"b\\\", \\\"a\\\"], categories=[\\\"c\\\", \\\"b\\\", \\\"a\\\"], ordered=True)}\\n+ )\\n+ ddf2 = dd.from_pandas(pdf2, 2)\\n+ expected = pd.concat([pdf1, pdf2])\\n+ expected[\\\"x\\\"] = expected[\\\"x\\\"].astype(\\\"category\\\")\\n+ result = dd.concat([ddf1, ddf2], ignore_order=True)\\n+ assert_eq(result, expected)\\n+\\n+\\n def test_categorical_join():\\n # https://github.com/dask/dask/issues/6134\\n df = pd.DataFrame(\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -1103,6 +1129,8 @@ def concat(\n ignore_unknown_divisions : bool, default False\n By default a warning is raised if any input has unknown divisions.\n Set to True to disable this warning.\n+ ignore_order : bool, default False\n+ Wether to ignore order when doing the union of categoricals.","line":null,"original_line":1133,"original_start_line":null,"path":"dask/dataframe/multi.py","start_line":null,"text":"@user1:\n```suggestion\r\n Whether to ignore order when doing the union of categoricals.\r\n```"}],"string":"[\n {\n \"diff_hunk\": \"@@ -1103,6 +1129,8 @@ def concat(\\n ignore_unknown_divisions : bool, default False\\n By default a warning is raised if any input has unknown divisions.\\n Set to True to disable this warning.\\n+ ignore_order : bool, default False\\n+ Wether to ignore order when doing the union of categoricals.\",\n \"line\": null,\n \"original_line\": 1133,\n \"original_start_line\": null,\n \"path\": \"dask/dataframe/multi.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\n```suggestion\\r\\n Whether to ignore order when doing the union of categoricals.\\r\\n```\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"d2db289eea9d605e6e5f758ceb80f7ef4bb61303"},"merged_patch":{"kind":"string","value":"diff --git a/dask/dataframe/methods.py b/dask/dataframe/methods.py\nindex 7c47d443c9a..2798c099c61 100644\n--- a/dask/dataframe/methods.py\n+++ b/dask/dataframe/methods.py\n@@ -398,6 +398,7 @@ def concat(\n join=\"outer\",\n uniform=False,\n filter_warning=True,\n+ ignore_order=False,\n ignore_index=False,\n **kwargs\n ):\n@@ -416,8 +417,11 @@ def concat(\n True if all arguments have the same columns and dtypes (but not\n necessarily categories). Default is False.\n ignore_index : bool, optional\n- Whether to allow index values to be ignored/droped during\n+ Whether to allow index values to be ignored/dropped during\n concatenation. Default is False.\n+ ignore_order : bool, optional\n+ Whether to ignore the order when doing the union of categoricals.\n+ Default is False.\n \"\"\"\n if len(dfs) == 1:\n return dfs[0]\n@@ -430,6 +434,7 @@ def concat(\n uniform=uniform,\n filter_warning=filter_warning,\n ignore_index=ignore_index,\n+ ignore_order=ignore_order,\n **kwargs\n )\n \n@@ -441,6 +446,7 @@ def concat_pandas(\n join=\"outer\",\n uniform=False,\n filter_warning=True,\n+ ignore_order=False,\n ignore_index=False,\n **kwargs\n ):\n@@ -453,7 +459,9 @@ def concat_pandas(\n for i in range(1, len(dfs)):\n if not isinstance(dfs[i], pd.CategoricalIndex):\n dfs[i] = dfs[i].astype(\"category\")\n- return pd.CategoricalIndex(union_categoricals(dfs), name=dfs[0].name)\n+ return pd.CategoricalIndex(\n+ union_categoricals(dfs, ignore_order=ignore_order), name=dfs[0].name\n+ )\n elif isinstance(dfs[0], pd.MultiIndex):\n first, rest = dfs[0], dfs[1:]\n if all(\n@@ -545,7 +553,7 @@ def concat_pandas(\n codes, sample.cat.categories, sample.cat.ordered\n )\n parts.append(data)\n- out[col] = union_categoricals(parts)\n+ out[col] = union_categoricals(parts, ignore_order=ignore_order)\n # Pandas resets index type on assignment if frame is empty\n # https://github.com/pandas-dev/pandas/issues/17101\n if not len(temp_ind):\n@@ -562,7 +570,11 @@ def concat_pandas(\n if is_categorical_dtype(dfs2[0].dtype):\n if ind is None:\n ind = concat([df.index for df in dfs2])\n- return pd.Series(union_categoricals(dfs2), index=ind, name=dfs2[0].name)\n+ return pd.Series(\n+ union_categoricals(dfs2, ignore_order=ignore_order),\n+ index=ind,\n+ name=dfs2[0].name,\n+ )\n with warnings.catch_warnings():\n if filter_warning:\n warnings.simplefilter(\"ignore\", FutureWarning)\ndiff --git a/dask/dataframe/multi.py b/dask/dataframe/multi.py\nindex dc472567fb1..045ea1abe68 100644\n--- a/dask/dataframe/multi.py\n+++ b/dask/dataframe/multi.py\n@@ -956,31 +956,38 @@ def merge_asof(\n ###############################################################\n \n \n-def concat_and_check(dfs):\n+def concat_and_check(dfs, ignore_order=False):\n if len(set(map(len, dfs))) != 1:\n raise ValueError(\"Concatenated DataFrames of different lengths\")\n- return methods.concat(dfs, axis=1)\n+ return methods.concat(dfs, ignore_order=ignore_order, axis=1)\n \n \n-def concat_unindexed_dataframes(dfs, **kwargs):\n+def concat_unindexed_dataframes(dfs, ignore_order=False, **kwargs):\n name = \"concat-\" + tokenize(*dfs)\n \n dsk = {\n- (name, i): (concat_and_check, [(df._name, i) for df in dfs])\n+ (name, i): (concat_and_check, [(df._name, i) for df in dfs], ignore_order)\n for i in range(dfs[0].npartitions)\n }\n \n- meta = methods.concat([df._meta for df in dfs], axis=1, **kwargs)\n+ meta = methods.concat(\n+ [df._meta for df in dfs], axis=1, ignore_order=ignore_order, **kwargs\n+ )\n \n graph = HighLevelGraph.from_collections(name, dsk, dependencies=dfs)\n return new_dd_object(graph, name, meta, dfs[0].divisions)\n \n \n-def concat_indexed_dataframes(dfs, axis=0, join=\"outer\", **kwargs):\n+def concat_indexed_dataframes(dfs, axis=0, join=\"outer\", ignore_order=False, **kwargs):\n \"\"\" Concatenate indexed dataframes together along the index \"\"\"\n warn = axis != 0\n meta = methods.concat(\n- [df._meta for df in dfs], axis=axis, join=join, filter_warning=warn, **kwargs\n+ [df._meta for df in dfs],\n+ axis=axis,\n+ join=join,\n+ filter_warning=warn,\n+ ignore_order=ignore_order,\n+ **kwargs,\n )\n empties = [strip_unknown_categories(df._meta) for df in dfs]\n \n@@ -997,7 +1004,10 @@ def concat_indexed_dataframes(dfs, axis=0, join=\"outer\", **kwargs):\n uniform = False\n \n dsk = dict(\n- ((name, i), (methods.concat, part, axis, join, uniform, filter_warning))\n+ (\n+ (name, i),\n+ (methods.concat, part, axis, join, uniform, filter_warning, ignore_order),\n+ )\n for i, part in enumerate(parts2)\n )\n for df in dfs2:\n@@ -1006,13 +1016,17 @@ def concat_indexed_dataframes(dfs, axis=0, join=\"outer\", **kwargs):\n return new_dd_object(dsk, name, meta, divisions)\n \n \n-def stack_partitions(dfs, divisions, join=\"outer\", **kwargs):\n+def stack_partitions(dfs, divisions, join=\"outer\", ignore_order=False, **kwargs):\n \"\"\"Concatenate partitions on axis=0 by doing a simple stack\"\"\"\n # Use _meta_nonempty as pandas.concat will incorrectly cast float to datetime\n # for empty data frames. See https://github.com/pandas-dev/pandas/issues/32934.\n meta = make_meta(\n methods.concat(\n- [df._meta_nonempty for df in dfs], join=join, filter_warning=False, **kwargs\n+ [df._meta_nonempty for df in dfs],\n+ join=join,\n+ filter_warning=False,\n+ ignore_order=ignore_order,\n+ **kwargs,\n )\n )\n empty = strip_unknown_categories(meta)\n@@ -1054,11 +1068,22 @@ def stack_partitions(dfs, divisions, join=\"outer\", **kwargs):\n except (ValueError, TypeError):\n match = False\n \n+ filter_warning = True\n+ uniform = False\n+\n for key in df.__dask_keys__():\n if match:\n dsk[(name, i)] = key\n else:\n- dsk[(name, i)] = (methods.concat, [empty, key], 0, join)\n+ dsk[(name, i)] = (\n+ methods.concat,\n+ [empty, key],\n+ 0,\n+ join,\n+ uniform,\n+ filter_warning,\n+ ignore_order,\n+ )\n i += 1\n \n return new_dd_object(dsk, name, meta, divisions)\n@@ -1070,6 +1095,7 @@ def concat(\n join=\"outer\",\n interleave_partitions=False,\n ignore_unknown_divisions=False,\n+ ignore_order=False,\n **kwargs,\n ):\n \"\"\"Concatenate DataFrames along rows.\n@@ -1103,6 +1129,8 @@ def concat(\n ignore_unknown_divisions : bool, default False\n By default a warning is raised if any input has unknown divisions.\n Set to True to disable this warning.\n+ ignore_order : bool, default False\n+ Whether to ignore order when doing the union of categoricals.\n \n Notes\n -----\n@@ -1180,7 +1208,9 @@ def concat(\n \n if axis == 1:\n if all(df.known_divisions for df in dasks):\n- return concat_indexed_dataframes(dfs, axis=axis, join=join, **kwargs)\n+ return concat_indexed_dataframes(\n+ dfs, axis=axis, join=join, ignore_order=ignore_order, **kwargs\n+ )\n elif (\n len(dasks) == len(dfs)\n and all(not df.known_divisions for df in dfs)\n@@ -1193,7 +1223,7 @@ def concat(\n \" are \\n aligned. This assumption is not generally \"\n \"safe.\"\n )\n- return concat_unindexed_dataframes(dfs, **kwargs)\n+ return concat_unindexed_dataframes(dfs, ignore_order=ignore_order, **kwargs)\n else:\n raise ValueError(\n \"Unable to concatenate DataFrame with unknown \"\n@@ -1211,15 +1241,23 @@ def concat(\n # remove last to concatenate with next\n divisions += df.divisions[:-1]\n divisions += dfs[-1].divisions\n- return stack_partitions(dfs, divisions, join=join, **kwargs)\n+ return stack_partitions(\n+ dfs, divisions, join=join, ignore_order=ignore_order, **kwargs\n+ )\n elif interleave_partitions:\n- return concat_indexed_dataframes(dfs, join=join, **kwargs)\n+ return concat_indexed_dataframes(\n+ dfs, join=join, ignore_order=ignore_order, **kwargs\n+ )\n else:\n divisions = [None] * (sum([df.npartitions for df in dfs]) + 1)\n- return stack_partitions(dfs, divisions, join=join, **kwargs)\n+ return stack_partitions(\n+ dfs, divisions, join=join, ignore_order=ignore_order, **kwargs\n+ )\n else:\n divisions = [None] * (sum([df.npartitions for df in dfs]) + 1)\n- return stack_partitions(dfs, divisions, join=join, **kwargs)\n+ return stack_partitions(\n+ dfs, divisions, join=join, ignore_order=ignore_order, **kwargs\n+ )\n \n \n def _contains_index_name(df, columns_or_index):\ndiff --git a/dask/dataframe/tests/test_multi.py b/dask/dataframe/tests/test_multi.py\nindex 5bd8e108cca..78cb4f5bcdc 100644\n--- a/dask/dataframe/tests/test_multi.py\n+++ b/dask/dataframe/tests/test_multi.py\n@@ -2143,6 +2143,30 @@ def test_groupby_concat_cudf(engine):\n assert_eq(res_dd.compute().sort_index(), res.sort_index())\n \n \n+@pytest.mark.parametrize(\"ordered\", [True, False])\n+def test_concat_ignore_order(ordered):\n+ pdf1 = pd.DataFrame(\n+ {\n+ \"x\": pd.Categorical(\n+ [\"a\", \"b\", \"c\", \"a\"], categories=[\"a\", \"b\", \"c\"], ordered=ordered\n+ )\n+ }\n+ )\n+ ddf1 = dd.from_pandas(pdf1, 2)\n+ pdf2 = pd.DataFrame(\n+ {\n+ \"x\": pd.Categorical(\n+ [\"c\", \"b\", \"a\"], categories=[\"c\", \"b\", \"a\"], ordered=ordered\n+ )\n+ }\n+ )\n+ ddf2 = dd.from_pandas(pdf2, 2)\n+ expected = pd.concat([pdf1, pdf2])\n+ expected[\"x\"] = expected[\"x\"].astype(\"category\")\n+ result = dd.concat([ddf1, ddf2], ignore_order=True)\n+ assert_eq(result, expected)\n+\n+\n def test_categorical_join():\n # https://github.com/dask/dask/issues/6134\n df = pd.DataFrame(\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2384,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-10989@bd08705"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":10989,"string":"10,989"},"title":{"kind":"string","value":"fix deprecation firing for microbatch model w custom strategy"},"body":{"kind":"string","value":"Resolves #10994\r\n\r\n### Problem\r\n\r\nThe deprecation about custom microbatch macros was being fired in the wrong instances. It was being fired a custom marcro _wasn't_ present instead of when it _was_ 🫠 \r\n\r\n### Solution\r\n\r\nNegate the conditional check of `self.manifest._microbatch_macro_is_core`\r\n\r\n### Checklist\r\n\r\n- [X] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me.\r\n- [X] I have run this code in development, and it appears to resolve the stated issue.\r\n- [X] This PR includes tests, or tests are not required or relevant for this PR.\r\n- [X] This PR has no interface changes (e.g., macros, CLI, logs, JSON artifacts, config files, adapter interface, etc.) or this PR has already received feedback and approval from Product or DX.\r\n- [X] This PR includes [type annotations](https://docs.python.org/3/library/typing.html) for new and modified functions.\r\n"},"created_at":{"kind":"string","value":"2024-11-12T20:07:03Z"},"problem_statement":{"kind":"string","value":"[Bug] Deprecation warning for custom `microbatch` macros is being fired incorrectly\n### Is this a new bug in dbt-core?\n\n- [X] I believe this is a new bug in dbt-core\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\n\n### Current Behavior\n\nA deprecation warning about custom microbatch marcos is issued IFF all the following are true\r\n1. a project _DOESNT_ have a custom \"microbatch\" macro\r\n2. the `require_batched_execution_for_custom_microbatch_strategy` is set to False\r\n3. the project has a \"microbatch\" model\n\n### Expected Behavior\n\nA deperecation warning about custom microbatch macros should only be issued IFF all the following are true\r\n1. a project _DOES_ have a custom \"microbatch\" macro\r\n2. the `require_batched_execution_for_custom_microbatch_strategy` is set to False\r\n3. the project has a \"microbatch\" model\n\n### Steps To Reproduce\n\n1. get dbt-postgres 1.9.0b1\r\n2. create a microbatch model in your project (without a custom \"microbatch\" macro)\r\n3. run `dbt run`\r\n4. observe the deprecation warning\n\n### Relevant log output\n\n_No response_\n\n### Environment\n\n```markdown\n- OS:\r\n- Python:\r\n- dbt:\n```\n\n\n### Which database adapter are you using with dbt?\n\n_No response_\n\n### Additional Context\n\n_No response_"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"### Is this a new bug in dbt-core?\n\n- [X] I believe this is a new bug in dbt-core\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\n\n### Current Behavior\n\nA deprecation warning about custom microbatch marcos is issued IFF all the following are true\r\n1. a project _DOESNT_ have a custom \"microbatch\" macro\r\n2. the `require_batched_execution_for_custom_microbatch_strategy` is set to False\r\n3. the project has a \"microbatch\" model\n\n### Expected Behavior\n\nA deperecation warning about custom microbatch macros should only be issued IFF all the following are true\r\n1. a project _DOES_ have a custom \"microbatch\" macro\r\n2. the `require_batched_execution_for_custom_microbatch_strategy` is set to False\r\n3. the project has a \"microbatch\" model\n\n### Steps To Reproduce\n\n1. get dbt-postgres 1.9.0b1\r\n2. create a microbatch model in your project (without a custom \"microbatch\" macro)\r\n3. run `dbt run`\r\n4. observe the deprecation warning\n\n### Relevant log output\n\n_No response_\n\n### Environment\n\n```markdown\n- OS:\r\n- Python:\r\n- dbt:\n```\n\n\n### Which database adapter are you using with dbt?\n\n_No response_\n\n### Additional Context\n\n_No response_","number":10994,"title":"[Bug] Deprecation warning for custom `microbatch` macros is being fired incorrectly"}],"string":"[\n {\n \"body\": \"### Is this a new bug in dbt-core?\\n\\n- [X] I believe this is a new bug in dbt-core\\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\\n\\n### Current Behavior\\n\\nA deprecation warning about custom microbatch marcos is issued IFF all the following are true\\r\\n1. a project _DOESNT_ have a custom \\\"microbatch\\\" macro\\r\\n2. the `require_batched_execution_for_custom_microbatch_strategy` is set to False\\r\\n3. the project has a \\\"microbatch\\\" model\\n\\n### Expected Behavior\\n\\nA deperecation warning about custom microbatch macros should only be issued IFF all the following are true\\r\\n1. a project _DOES_ have a custom \\\"microbatch\\\" macro\\r\\n2. the `require_batched_execution_for_custom_microbatch_strategy` is set to False\\r\\n3. the project has a \\\"microbatch\\\" model\\n\\n### Steps To Reproduce\\n\\n1. get dbt-postgres 1.9.0b1\\r\\n2. create a microbatch model in your project (without a custom \\\"microbatch\\\" macro)\\r\\n3. run `dbt run`\\r\\n4. observe the deprecation warning\\n\\n### Relevant log output\\n\\n_No response_\\n\\n### Environment\\n\\n```markdown\\n- OS:\\r\\n- Python:\\r\\n- dbt:\\n```\\n\\n\\n### Which database adapter are you using with dbt?\\n\\n_No response_\\n\\n### Additional Context\\n\\n_No response_\",\n \"number\": 10994,\n \"title\": \"[Bug] Deprecation warning for custom `microbatch` macros is being fired incorrectly\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"89caa33fb42a74087a5ff9cb3ed56d37bfd63f5a"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"bd087056c3f43e9ea1af1dfffd913eef91c355dc\",\n \"head_commit_message\": \"Add changie doc\",\n \"patch_to_review\": \"diff --git a/.changes/unreleased/Fixes-20241112-210839.yaml b/.changes/unreleased/Fixes-20241112-210839.yaml\\nnew file mode 100644\\nindex 00000000000..031e160f092\\n--- /dev/null\\n+++ b/.changes/unreleased/Fixes-20241112-210839.yaml\\n@@ -0,0 +1,6 @@\\n+kind: Fixes\\n+body: Correct when custom microbatch macro deprecation warning is fired\\n+time: 2024-11-12T21:08:39.866837-06:00\\n+custom:\\n+ Author: QMalcolm MichelleArk\\n+ Issue: \\\"10994\\\"\\ndiff --git a/core/dbt/parser/manifest.py b/core/dbt/parser/manifest.py\\nindex 6743bf5e6e7..fbfc83cd6c5 100644\\n--- a/core/dbt/parser/manifest.py\\n+++ b/core/dbt/parser/manifest.py\\n@@ -662,7 +662,7 @@ def check_for_microbatch_deprecations(self) -> None:\\n has_microbatch_model = True\\n break\\n \\n- if has_microbatch_model and self.manifest._microbatch_macro_is_core(\\n+ if has_microbatch_model and not self.manifest._microbatch_macro_is_core(\\n self.root_project.project_name\\n ):\\n dbt.deprecations.warn(\\\"microbatch-macro-outside-of-batches-deprecation\\\")\\ndiff --git a/dev-requirements.txt b/dev-requirements.txt\\nindex 20605e632b8..4f0a8f68fa8 100644\\n--- a/dev-requirements.txt\\n+++ b/dev-requirements.txt\\n@@ -1,4 +1,4 @@\\n-git+https://github.com/dbt-labs/dbt-adapters.git@main\\n+git+https://github.com/dbt-labs/dbt-adapters.git@fix-microbatch-behavior-flag-conditional\\n git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter\\n git+https://github.com/dbt-labs/dbt-common.git@main\\n git+https://github.com/dbt-labs/dbt-postgres.git@main\\ndiff --git a/tests/functional/microbatch/test_microbatch.py b/tests/functional/microbatch/test_microbatch.py\\nindex b98ad38caa9..3de48225f44 100644\\n--- a/tests/functional/microbatch/test_microbatch.py\\n+++ b/tests/functional/microbatch/test_microbatch.py\\n@@ -182,19 +182,16 @@ def test_use_custom_microbatch_strategy_by_default(\\n project,\\n deprecation_catcher: EventCatcher,\\n ):\\n- with mock.patch.object(\\n- type(project.adapter), \\\"valid_incremental_strategies\\\", lambda _: []\\n- ):\\n- # Initial run\\n- run_dbt([\\\"run\\\"])\\n+ # Initial run fires deprecation\\n+ run_dbt([\\\"run\\\"], callbacks=[deprecation_catcher.catch])\\n+ # Deprecation warning about custom microbatch macro fired\\n+ assert len(deprecation_catcher.caught_events) == 1\\n \\n- # Incremental run uses custom strategy\\n- _, logs = run_dbt_and_capture([\\\"run\\\"])\\n- assert \\\"custom microbatch strategy\\\" in logs\\n- # The custom strategy wasn't used with batch functionality\\n- assert \\\"START batch\\\" not in logs\\n- # Deprecation warning about custom microbatch macro fired\\n- assert len(deprecation_catcher.caught_events) == 0\\n+ # Incremental run uses custom strategy\\n+ _, logs = run_dbt_and_capture([\\\"run\\\"])\\n+ assert \\\"custom microbatch strategy\\\" in logs\\n+ # The custom strategy wasn't used with batch functionality\\n+ assert \\\"START batch\\\" not in logs\\n \\n \\n class TestMicrobatchCustomUserStrategyProjectFlagTrueValid(BaseMicrobatchCustomUserStrategy):\\n@@ -208,7 +205,9 @@ def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_st\\n ):\\n # Initial run\\n with patch_microbatch_end_time(\\\"2020-01-03 13:57:00\\\"):\\n- run_dbt([\\\"run\\\"])\\n+ run_dbt([\\\"run\\\"], callbacks=[deprecation_catcher.catch])\\n+ # Deprecation warning about custom microbatch macro not fired\\n+ assert len(deprecation_catcher.caught_events) == 0\\n \\n # Incremental run uses custom strategy\\n with patch_microbatch_end_time(\\\"2020-01-03 13:57:00\\\"):\\n@@ -216,11 +215,11 @@ def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_st\\n assert \\\"custom microbatch strategy\\\" in logs\\n # The custom strategy was used with batch functionality\\n assert \\\"START batch\\\" in logs\\n- # Deprecation warning about custom microbatch macro not fired\\n- assert len(deprecation_catcher.caught_events) == 0\\n \\n \\n-class TestMicrobatchCustomUserStrategyProjectFlagTrueInvalid(BaseMicrobatchCustomUserStrategy):\\n+class TestMicrobatchCustomUserStrategyProjectFlagTrueNoValidBuiltin(\\n+ BaseMicrobatchCustomUserStrategy\\n+):\\n def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_strategy(\\n self, project\\n ):\\n@@ -228,10 +227,15 @@ def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_st\\n type(project.adapter), \\\"valid_incremental_strategies\\\", lambda _: []\\n ):\\n # Run of microbatch model while adapter doesn't have a \\\"valid\\\"\\n- # microbatch strategy causes an error to be raised\\n+ # microbatch strategy causes no error when behaviour flag set to true\\n+ # and there is a custom microbatch macro\\n with patch_microbatch_end_time(\\\"2020-01-03 13:57:00\\\"):\\n- _, logs = run_dbt_and_capture([\\\"run\\\"], expect_pass=False)\\n- assert \\\"'microbatch' is not valid\\\" in logs\\n+ _, logs = run_dbt_and_capture([\\\"run\\\"])\\n+ assert \\\"'microbatch' is not valid\\\" not in logs\\n+ assert (\\n+ \\\"The use of a custom microbatch macro outside of batched execution is deprecated\\\"\\n+ not in logs\\n+ )\\n \\n \\n class BaseMicrobatchTest:\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -1,4 +1,4 @@\n-git+https://github.com/dbt-labs/dbt-adapters.git@main\n+git+https://github.com/dbt-labs/dbt-adapters.git@fix-microbatch-behavior-flag-conditional","line":null,"original_line":1,"original_start_line":null,"path":"dev-requirements.txt","start_line":null,"text":"@user1:\nWe have to undo this change before merging"}],"string":"[\n {\n \"diff_hunk\": \"@@ -1,4 +1,4 @@\\n-git+https://github.com/dbt-labs/dbt-adapters.git@main\\n+git+https://github.com/dbt-labs/dbt-adapters.git@fix-microbatch-behavior-flag-conditional\",\n \"line\": null,\n \"original_line\": 1,\n \"original_start_line\": null,\n \"path\": \"dev-requirements.txt\",\n \"start_line\": null,\n \"text\": \"@user1:\\nWe have to undo this change before merging\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"82a093a2a4cd8d1bed265cf451b08b90a0a7e136"},"merged_patch":{"kind":"string","value":"diff --git a/.changes/unreleased/Fixes-20241112-210839.yaml b/.changes/unreleased/Fixes-20241112-210839.yaml\nnew file mode 100644\nindex 00000000000..031e160f092\n--- /dev/null\n+++ b/.changes/unreleased/Fixes-20241112-210839.yaml\n@@ -0,0 +1,6 @@\n+kind: Fixes\n+body: Correct when custom microbatch macro deprecation warning is fired\n+time: 2024-11-12T21:08:39.866837-06:00\n+custom:\n+ Author: QMalcolm MichelleArk\n+ Issue: \"10994\"\ndiff --git a/core/dbt/parser/manifest.py b/core/dbt/parser/manifest.py\nindex 6743bf5e6e7..fbfc83cd6c5 100644\n--- a/core/dbt/parser/manifest.py\n+++ b/core/dbt/parser/manifest.py\n@@ -662,7 +662,7 @@ def check_for_microbatch_deprecations(self) -> None:\n has_microbatch_model = True\n break\n \n- if has_microbatch_model and self.manifest._microbatch_macro_is_core(\n+ if has_microbatch_model and not self.manifest._microbatch_macro_is_core(\n self.root_project.project_name\n ):\n dbt.deprecations.warn(\"microbatch-macro-outside-of-batches-deprecation\")\ndiff --git a/tests/functional/microbatch/test_microbatch.py b/tests/functional/microbatch/test_microbatch.py\nindex b98ad38caa9..3de48225f44 100644\n--- a/tests/functional/microbatch/test_microbatch.py\n+++ b/tests/functional/microbatch/test_microbatch.py\n@@ -182,19 +182,16 @@ def test_use_custom_microbatch_strategy_by_default(\n project,\n deprecation_catcher: EventCatcher,\n ):\n- with mock.patch.object(\n- type(project.adapter), \"valid_incremental_strategies\", lambda _: []\n- ):\n- # Initial run\n- run_dbt([\"run\"])\n+ # Initial run fires deprecation\n+ run_dbt([\"run\"], callbacks=[deprecation_catcher.catch])\n+ # Deprecation warning about custom microbatch macro fired\n+ assert len(deprecation_catcher.caught_events) == 1\n \n- # Incremental run uses custom strategy\n- _, logs = run_dbt_and_capture([\"run\"])\n- assert \"custom microbatch strategy\" in logs\n- # The custom strategy wasn't used with batch functionality\n- assert \"START batch\" not in logs\n- # Deprecation warning about custom microbatch macro fired\n- assert len(deprecation_catcher.caught_events) == 0\n+ # Incremental run uses custom strategy\n+ _, logs = run_dbt_and_capture([\"run\"])\n+ assert \"custom microbatch strategy\" in logs\n+ # The custom strategy wasn't used with batch functionality\n+ assert \"START batch\" not in logs\n \n \n class TestMicrobatchCustomUserStrategyProjectFlagTrueValid(BaseMicrobatchCustomUserStrategy):\n@@ -208,7 +205,9 @@ def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_st\n ):\n # Initial run\n with patch_microbatch_end_time(\"2020-01-03 13:57:00\"):\n- run_dbt([\"run\"])\n+ run_dbt([\"run\"], callbacks=[deprecation_catcher.catch])\n+ # Deprecation warning about custom microbatch macro not fired\n+ assert len(deprecation_catcher.caught_events) == 0\n \n # Incremental run uses custom strategy\n with patch_microbatch_end_time(\"2020-01-03 13:57:00\"):\n@@ -216,11 +215,11 @@ def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_st\n assert \"custom microbatch strategy\" in logs\n # The custom strategy was used with batch functionality\n assert \"START batch\" in logs\n- # Deprecation warning about custom microbatch macro not fired\n- assert len(deprecation_catcher.caught_events) == 0\n \n \n-class TestMicrobatchCustomUserStrategyProjectFlagTrueInvalid(BaseMicrobatchCustomUserStrategy):\n+class TestMicrobatchCustomUserStrategyProjectFlagTrueNoValidBuiltin(\n+ BaseMicrobatchCustomUserStrategy\n+):\n def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_strategy(\n self, project\n ):\n@@ -228,10 +227,15 @@ def test_use_custom_microbatch_strategy_project_flag_true_invalid_incremental_st\n type(project.adapter), \"valid_incremental_strategies\", lambda _: []\n ):\n # Run of microbatch model while adapter doesn't have a \"valid\"\n- # microbatch strategy causes an error to be raised\n+ # microbatch strategy causes no error when behaviour flag set to true\n+ # and there is a custom microbatch macro\n with patch_microbatch_end_time(\"2020-01-03 13:57:00\"):\n- _, logs = run_dbt_and_capture([\"run\"], expect_pass=False)\n- assert \"'microbatch' is not valid\" in logs\n+ _, logs = run_dbt_and_capture([\"run\"])\n+ assert \"'microbatch' is not valid\" not in logs\n+ assert (\n+ \"The use of a custom microbatch macro outside of batched execution is deprecated\"\n+ not in logs\n+ )\n \n \n class BaseMicrobatchTest:\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"low\",\n \"estimated_review_effort\": 2,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2385,"cells":{"instance_id":{"kind":"string","value":"cupy__cupy-3936@493d069"},"repo":{"kind":"string","value":"cupy/cupy"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":3936,"string":"3,936"},"title":{"kind":"string","value":"Support cublasXgetrsBatched and add cupy.cublas.batched_gesv"},"body":{"kind":"string","value":"Closes https://github.com/cupy/cupy/issues/3931"},"created_at":{"kind":"string","value":"2020-09-03T13:47:31Z"},"problem_statement":{"kind":"string","value":"Performance issue : cupy is 800 times slower than numpy in linalg.solve()\nDear cupy team,\r\n\r\nI found that the cupy.linalg.solve routine is much slower than the corresponding numpy routine (about 800 times, which makes is unusable), in a very simple and massively parallel instance. Here I solve 10000 linear systems of size 2x2 in parallel.\r\n\r\n```console\r\nimport numpy as np\r\nimport cupy as cp\r\nimport time\r\n\r\nn=10000 \r\na = cp.empty((n,2,2),dtype=np.float32)\r\nv = cp.empty((n,2),dtype=np.float32)\r\n\r\na[:,0,0]=a[:,1,1]=1; a[:,1,0]=a[:,0,1]=0\r\nv[0]=0; v[1]=1\r\n\r\nt0=time.time()\r\nnp.linalg.solve(a,v)\r\nt1=time.time()\r\nnp.linalg.solve(a.get(),v.get())\r\nt2=time.time()\r\n\r\nt_cupy,t_numpy=t1-t0,t2-t1\r\nprint(f\"t_cupy={t_cupy}, t_numpy={t_numpy}, ratio={t_cupy/t_numpy}\")\r\n```\r\n\r\nOutput : \r\n```console\r\nt_cupy=2.396995782852173, t_numpy=0.0030279159545898438, ratio=791.6322047244095\r\n```\r\n\r\nOS : Windows\r\nCuPy version : 7.8\r\nCuda version : 10.2\r\nGraphics card : Nvidia 1080 GTX\r\n\r\nAny chance to solve this performance issue ?\r\n\r\n-- Full output of cp.show_config() --\r\nCuPy Version : 7.8.0\r\nCUDA Root : None\r\nCUDA Build Version : 10020\r\nCUDA Driver Version : 11000\r\nCUDA Runtime Version : 10020\r\ncuBLAS Version : 10202\r\ncuFFT Version : 10102\r\ncuRAND Version : 10102\r\ncuSOLVER Version : (10, 3, 0)\r\ncuSPARSE Version : 10301\r\nNVRTC Version : (10, 2)\r\ncuDNN Build Version : 7605\r\ncuDNN Version : 7605\r\nNCCL Build Version : None\r\nNCCL Runtime Version : None\r\nCUB Version : None\r\ncuTENSOR Version : None"},"hints_text":{"kind":"string","value":"It is not surprising to see such slow performance when solving multiple small linear matrix equations, because the current `cupy.linalg.solve` implementation solves the multiple linear matrix equations one by one.\r\nhttps://github.com/cupy/cupy/blob/e2b5a3c19f8aec1c4acfda239265ba4e54e5bd60/cupy/linalg/solve.py#L65-L68\r\n\r\nProbably, your use case can be significantly improved by using [cublasXgetrfBatched()](https://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrfbatched) and [cublasXgettrsBatched(](https://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrsbatched)).\nOk, thanks for the workaround.\nIt would be nice feature if cupy handled it directly though.\n\n> Le 3 sept. 2020 à 11:09, Akira Naruse <notifications@github.com> a écrit :\n> \n> \n> It is not surprising to see such slow performance when solving multiple small linear matrix equations, because the current cupy.linalg.solve implementation solves the multiple linear matrix equations one by one.\n> https://github.com/cupy/cupy/blob/e2b5a3c19f8aec1c4acfda239265ba4e54e5bd60/cupy/linalg/solve.py#L65-L68 <https://github.com/cupy/cupy/blob/e2b5a3c19f8aec1c4acfda239265ba4e54e5bd60/cupy/linalg/solve.py#L65-L68>\n> Probably, your use case can be significantly improved by using cublasXgetrfBatched() <https://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrfbatched> and cublasXgettrsBatched( <https://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrsbatched>).\n> \n> —\n> You are receiving this because you authored the thread.\n> Reply to this email directly, view it on GitHub <https://github.com/cupy/cupy/issues/3931#issuecomment-686359901>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAYOZPTOVY3K5XHK27KPKYTSD5MN7ANCNFSM4QUNJZ4Q>.\n>"},"resolved_issues":{"kind":"list like","value":[{"body":"Dear cupy team,\r\n\r\nI found that the cupy.linalg.solve routine is much slower than the corresponding numpy routine (about 800 times, which makes is unusable), in a very simple and massively parallel instance. Here I solve 10000 linear systems of size 2x2 in parallel.\r\n\r\n```console\r\nimport numpy as np\r\nimport cupy as cp\r\nimport time\r\n\r\nn=10000 \r\na = cp.empty((n,2,2),dtype=np.float32)\r\nv = cp.empty((n,2),dtype=np.float32)\r\n\r\na[:,0,0]=a[:,1,1]=1; a[:,1,0]=a[:,0,1]=0\r\nv[0]=0; v[1]=1\r\n\r\nt0=time.time()\r\nnp.linalg.solve(a,v)\r\nt1=time.time()\r\nnp.linalg.solve(a.get(),v.get())\r\nt2=time.time()\r\n\r\nt_cupy,t_numpy=t1-t0,t2-t1\r\nprint(f\"t_cupy={t_cupy}, t_numpy={t_numpy}, ratio={t_cupy/t_numpy}\")\r\n```\r\n\r\nOutput : \r\n```console\r\nt_cupy=2.396995782852173, t_numpy=0.0030279159545898438, ratio=791.6322047244095\r\n```\r\n\r\nOS : Windows\r\nCuPy version : 7.8\r\nCuda version : 10.2\r\nGraphics card : Nvidia 1080 GTX\r\n\r\nAny chance to solve this performance issue ?\r\n\r\n-- Full output of cp.show_config() --\r\nCuPy Version : 7.8.0\r\nCUDA Root : None\r\nCUDA Build Version : 10020\r\nCUDA Driver Version : 11000\r\nCUDA Runtime Version : 10020\r\ncuBLAS Version : 10202\r\ncuFFT Version : 10102\r\ncuRAND Version : 10102\r\ncuSOLVER Version : (10, 3, 0)\r\ncuSPARSE Version : 10301\r\nNVRTC Version : (10, 2)\r\ncuDNN Build Version : 7605\r\ncuDNN Version : 7605\r\nNCCL Build Version : None\r\nNCCL Runtime Version : None\r\nCUB Version : None\r\ncuTENSOR Version : None","number":3931,"title":"Performance issue : cupy is 800 times slower than numpy in linalg.solve()"}],"string":"[\n {\n \"body\": \"Dear cupy team,\\r\\n\\r\\nI found that the cupy.linalg.solve routine is much slower than the corresponding numpy routine (about 800 times, which makes is unusable), in a very simple and massively parallel instance. Here I solve 10000 linear systems of size 2x2 in parallel.\\r\\n\\r\\n```console\\r\\nimport numpy as np\\r\\nimport cupy as cp\\r\\nimport time\\r\\n\\r\\nn=10000 \\r\\na = cp.empty((n,2,2),dtype=np.float32)\\r\\nv = cp.empty((n,2),dtype=np.float32)\\r\\n\\r\\na[:,0,0]=a[:,1,1]=1; a[:,1,0]=a[:,0,1]=0\\r\\nv[0]=0; v[1]=1\\r\\n\\r\\nt0=time.time()\\r\\nnp.linalg.solve(a,v)\\r\\nt1=time.time()\\r\\nnp.linalg.solve(a.get(),v.get())\\r\\nt2=time.time()\\r\\n\\r\\nt_cupy,t_numpy=t1-t0,t2-t1\\r\\nprint(f\\\"t_cupy={t_cupy}, t_numpy={t_numpy}, ratio={t_cupy/t_numpy}\\\")\\r\\n```\\r\\n\\r\\nOutput : \\r\\n```console\\r\\nt_cupy=2.396995782852173, t_numpy=0.0030279159545898438, ratio=791.6322047244095\\r\\n```\\r\\n\\r\\nOS : Windows\\r\\nCuPy version : 7.8\\r\\nCuda version : 10.2\\r\\nGraphics card : Nvidia 1080 GTX\\r\\n\\r\\nAny chance to solve this performance issue ?\\r\\n\\r\\n-- Full output of cp.show_config() --\\r\\nCuPy Version : 7.8.0\\r\\nCUDA Root : None\\r\\nCUDA Build Version : 10020\\r\\nCUDA Driver Version : 11000\\r\\nCUDA Runtime Version : 10020\\r\\ncuBLAS Version : 10202\\r\\ncuFFT Version : 10102\\r\\ncuRAND Version : 10102\\r\\ncuSOLVER Version : (10, 3, 0)\\r\\ncuSPARSE Version : 10301\\r\\nNVRTC Version : (10, 2)\\r\\ncuDNN Build Version : 7605\\r\\ncuDNN Version : 7605\\r\\nNCCL Build Version : None\\r\\nNCCL Runtime Version : None\\r\\nCUB Version : None\\r\\ncuTENSOR Version : None\",\n \"number\": 3931,\n \"title\": \"Performance issue : cupy is 800 times slower than numpy in linalg.solve()\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"07fef67fc8a493252f21c393eb007ca0a7d04c10"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"493d0698de7d98dff2b93df9e4ec8cc63625636c\",\n \"head_commit_message\": \"Add error checks\",\n \"patch_to_review\": \"diff --git a/cupy/cublas.py b/cupy/cublas.py\\nnew file mode 100644\\nindex 00000000000..04b5cc58ad2\\n--- /dev/null\\n+++ b/cupy/cublas.py\\n@@ -0,0 +1,78 @@\\n+import numpy\\n+\\n+import cupy\\n+from cupy_backends.cuda.libs import cublas\\n+from cupy.cuda import device\\n+from cupy.linalg import util\\n+\\n+\\n+def batched_gesv(a, b):\\n+ \\\"\\\"\\\"Solves multiple linear matrix equations using cublas<t>getr[fs]Batched().\\n+\\n+ Computes the solution to system of linear equation ``ax = b``.\\n+\\n+ Args:\\n+ a (cupy.ndarray): The matrix with dimension ``(..., M, M)``.\\n+ b (cupy.ndarray): The matrix with dimension ``(..., M)`` or\\n+ ``(..., M, K)``.\\n+\\n+ Returns:\\n+ cupy.ndarray:\\n+ The matrix with dimension ``(..., M)`` or ``(..., M, K)``.\\n+ \\\"\\\"\\\"\\n+ util._assert_cupy_array(a, b)\\n+ util._assert_nd_squareness(a)\\n+\\n+ if not ((a.ndim == b.ndim or a.ndim == b.ndim + 1) and\\n+ a.shape[:-1] == b.shape[:a.ndim - 1]):\\n+ raise ValueError(\\n+ 'a must have (..., M, M) shape and b must have (..., M) '\\n+ 'or (..., M, K)')\\n+\\n+ dtype = numpy.promote_types(a.dtype.char, 'f')\\n+ if dtype == 'f':\\n+ t = 's'\\n+ elif dtype == 'd':\\n+ t = 'd'\\n+ elif dtype == 'F':\\n+ t = 'c'\\n+ elif dtype == 'D':\\n+ t = 'z'\\n+ else:\\n+ raise TypeError('invalid dtype')\\n+ getrf = getattr(cublas, t + 'getrfBatched')\\n+ getrs = getattr(cublas, t + 'getrsBatched')\\n+\\n+ bs = numpy.prod(a.shape[:-2]) if a.ndim > 2 else 1\\n+ n = a.shape[-1]\\n+ nrhs = b.shape[-1] if a.ndim == b.ndim else 1\\n+ b_shape = b.shape\\n+ a_data_ptr = a.data.ptr\\n+ b_data_ptr = b.data.ptr\\n+ a = cupy.ascontiguousarray(a.reshape(bs, n, n).transpose(0, 2, 1),\\n+ dtype=dtype)\\n+ b = cupy.ascontiguousarray(b.reshape(bs, n, nrhs).transpose(0, 2, 1),\\n+ dtype=dtype)\\n+ if a.data.ptr == a_data_ptr:\\n+ a = a.copy()\\n+ if b.data.ptr == b_data_ptr:\\n+ b = b.copy()\\n+\\n+ handle = device.get_cublas_handle()\\n+ lda = n\\n+ a_step = lda * n * a.itemsize\\n+ a_array = cupy.arange(a.data.ptr, a.data.ptr + a_step * bs, a_step,\\n+ dtype=cupy.uintp)\\n+ ldb = n\\n+ b_step = ldb * nrhs * b.itemsize\\n+ b_array = cupy.arange(b.data.ptr, b.data.ptr + b_step * bs, b_step,\\n+ dtype=cupy.uintp)\\n+ pivot = cupy.empty((bs, n), dtype=numpy.int32)\\n+ info = cupy.empty((bs,), dtype=numpy.int32)\\n+ # LU factorization (A = L * U)\\n+ getrf(handle, n, a_array.data.ptr, lda, pivot.data.ptr, info.data.ptr, bs)\\n+ util._check_cublas_info_array_if_synchronization_allowed(getrf, info)\\n+ # Solves Ax = b\\n+ getrs(handle, cublas.CUBLAS_OP_N, n, nrhs, a_array.data.ptr, lda,\\n+ pivot.data.ptr, b_array.data.ptr, ldb, bs)\\n+ return b.transpose(0, 2, 1).reshape(b_shape)\\ndiff --git a/cupy/linalg/solve.py b/cupy/linalg/solve.py\\nindex 78f996bda3c..52ec3bcc93a 100644\\n--- a/cupy/linalg/solve.py\\n+++ b/cupy/linalg/solve.py\\n@@ -8,6 +8,7 @@\\n from cupy.cuda import device\\n from cupy.linalg import decomposition\\n from cupy.linalg import util\\n+from cupy.cublas import batched_gesv\\n \\n \\n def solve(a, b):\\n@@ -54,6 +55,9 @@ def solve(a, b):\\n if a.ndim == 2:\\n return cupy.cusolver.gesv(a, b)\\n \\n+ if a.shape[-1] <= 256:\\n+ return batched_gesv(a, b)\\n+\\n x = cupy.empty_like(b)\\n shape = a.shape[:-2]\\n for i in range(numpy.prod(shape)):\\ndiff --git a/cupy_backends/cuda/cupy_cuda.h b/cupy_backends/cuda/cupy_cuda.h\\nindex 4928baae37a..807ddfa8cd2 100644\\n--- a/cupy_backends/cuda/cupy_cuda.h\\n+++ b/cupy_backends/cuda/cupy_cuda.h\\n@@ -782,6 +782,22 @@ cublasStatus_t cublasZgetrfBatched(...) {\\n return CUBLAS_STATUS_SUCCESS;\\n }\\n \\n+cublasStatus_t cublasSgetrsBatched(...) {\\n+ return CUBLAS_STATUS_SUCCESS;\\n+}\\n+\\n+cublasStatus_t cublasDgetrsBatched(...) {\\n+ return CUBLAS_STATUS_SUCCESS;\\n+}\\n+\\n+cublasStatus_t cublasCgetrsBatched(...) {\\n+ return CUBLAS_STATUS_SUCCESS;\\n+}\\n+\\n+cublasStatus_t cublasZgetrsBatched(...) {\\n+ return CUBLAS_STATUS_SUCCESS;\\n+}\\n+\\n cublasStatus_t cublasSgetriBatched(...) {\\n return CUBLAS_STATUS_SUCCESS;\\n }\\ndiff --git a/cupy_backends/cuda/libs/cublas.pxd b/cupy_backends/cuda/libs/cublas.pxd\\nindex fba04526e30..2d16affb1be 100644\\n--- a/cupy_backends/cuda/libs/cublas.pxd\\n+++ b/cupy_backends/cuda/libs/cublas.pxd\\n@@ -249,6 +249,19 @@ cpdef cgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\\n cpdef zgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\\n size_t PivotArray, size_t infoArray, int batchSize)\\n \\n+cpdef int sgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize)\\n+cpdef int dgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize)\\n+cpdef int cgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize)\\n+cpdef int zgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize)\\n+\\n cpdef sgetriBatched(intptr_t handle, int n, size_t Aarray, int lda,\\n size_t PivotArray, size_t Carray, int ldc,\\n size_t infoArray, int batchSize)\\ndiff --git a/cupy_backends/cuda/libs/cublas.pyx b/cupy_backends/cuda/libs/cublas.pyx\\nindex b64e880f391..c26cd15025e 100644\\n--- a/cupy_backends/cuda/libs/cublas.pyx\\n+++ b/cupy_backends/cuda/libs/cublas.pyx\\n@@ -221,6 +221,24 @@ cdef extern from '../cupy_cuda.h' nogil:\\n int cublasZgetrfBatched(\\n Handle handle, int n, cuDoubleComplex **Aarray, int lda,\\n int *PivotArray, int *infoArray, int batchSize)\\n+\\n+ int cublasSgetrsBatched(\\n+ Handle handle, Operation trans, int n, int nrhs,\\n+ const float **Aarray, int lda, const int *devIpiv,\\n+ float **Barray, int ldb, int *info, int batchSize)\\n+ int cublasDgetrsBatched(\\n+ Handle handle, Operation trans, int n, int nrhs,\\n+ const double **Aarray, int lda, const int *devIpiv,\\n+ double **Barray, int ldb, int *info, int batchSize)\\n+ int cublasCgetrsBatched(\\n+ Handle handle, Operation trans, int n, int nrhs,\\n+ const cuComplex **Aarray, int lda, const int *devIpiv,\\n+ cuComplex **Barray, int ldb, int *info, int batchSize)\\n+ int cublasZgetrsBatched(\\n+ Handle handle, Operation trans, int n, int nrhs,\\n+ const cuDoubleComplex **Aarray, int lda, const int *devIpiv,\\n+ cuDoubleComplex **Barray, int ldb, int *info, int batchSize)\\n+\\n int cublasSgetriBatched(\\n Handle handle, int n, const float **Aarray, int lda,\\n int *PivotArray, float *Carray[], int ldc, int *infoArray,\\n@@ -1004,6 +1022,59 @@ cpdef zgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\\n check_status(status)\\n \\n \\n+cpdef int sgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize):\\n+ cdef int info\\n+ _setStream(handle)\\n+ with nogil:\\n+ status = cublasSgetrsBatched(\\n+ <Handle>handle, <Operation>trans, n, nrhs,\\n+ <const float**>Aarray, lda, <const int*>devIpiv,\\n+ <float**>Barray, ldb, &info, batchSize)\\n+ check_status(status)\\n+ return info\\n+\\n+cpdef int dgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize):\\n+ cdef int info\\n+ _setStream(handle)\\n+ with nogil:\\n+ status = cublasDgetrsBatched(\\n+ <Handle>handle, <Operation>trans, n, nrhs,\\n+ <const double**>Aarray, lda, <const int*>devIpiv,\\n+ <double**>Barray, ldb, &info, batchSize)\\n+ check_status(status)\\n+ return info\\n+\\n+cpdef int cgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize):\\n+ cdef int info\\n+ _setStream(handle)\\n+ with nogil:\\n+ status = cublasCgetrsBatched(\\n+ <Handle>handle, <Operation>trans, n, nrhs,\\n+ <const cuComplex**>Aarray, lda, <const int*>devIpiv,\\n+ <cuComplex**>Barray, ldb, &info, batchSize)\\n+ check_status(status)\\n+ return info\\n+\\n+cpdef int zgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize):\\n+ cdef int info\\n+ _setStream(handle)\\n+ with nogil:\\n+ status = cublasZgetrsBatched(\\n+ <Handle>handle, <Operation>trans, n, nrhs,\\n+ <const cuDoubleComplex**>Aarray, lda, <const int*>devIpiv,\\n+ <cuDoubleComplex**>Barray, ldb, &info, batchSize)\\n+ check_status(status)\\n+ return info\\n+\\n+\\n cpdef sgetriBatched(\\n intptr_t handle, int n, size_t Aarray, int lda, size_t PivotArray,\\n size_t Carray, int ldc, size_t infoArray, int batchSize):\\ndiff --git a/tests/cupy_tests/test_cublas.py b/tests/cupy_tests/test_cublas.py\\nnew file mode 100644\\nindex 00000000000..1f58c95db25\\n--- /dev/null\\n+++ b/tests/cupy_tests/test_cublas.py\\n@@ -0,0 +1,67 @@\\n+import unittest\\n+\\n+import numpy\\n+\\n+import cupy\\n+from cupy import cublas\\n+from cupy import testing\\n+from cupy.testing import attr\\n+\\n+\\n+@testing.parameterize(*testing.product({\\n+ 'dtype': ['float32', 'float64', 'complex64', 'complex128'],\\n+ 'n': [10, 33, 100],\\n+ 'bs': [None, 1, 10],\\n+ 'nrhs': [None, 1, 10],\\n+}))\\n+@attr.gpu\\n+class TestBatchedGesv(unittest.TestCase):\\n+ _tol = {'f': 1e-5, 'd': 1e-12}\\n+\\n+ def _make_array(self, shape, alpha, beta):\\n+ a = testing.shaped_random(shape, cupy, dtype=self.r_dtype,\\n+ scale=alpha) + beta\\n+ return a\\n+\\n+ def _make_matrix(self, shape, alpha, beta):\\n+ a = self._make_array(shape, alpha, beta)\\n+ if self.dtype.char in 'FD':\\n+ a = a + 1j * self._make_array(shape, alpha, beta)\\n+ return a\\n+\\n+ def setUp(self):\\n+ self.dtype = numpy.dtype(self.dtype)\\n+ if self.dtype.char in 'fF':\\n+ self.r_dtype = numpy.float32\\n+ else:\\n+ self.r_dtype = numpy.float64\\n+ n = self.n\\n+ bs = 1 if self.bs is None else self.bs\\n+ nrhs = 1 if self.nrhs is None else self.nrhs\\n+ # Diagonally dominant matrix is used as it is stable\\n+ alpha = 2.0 / n\\n+ a = self._make_matrix((bs, n, n), alpha, -alpha / 2)\\n+ diag = cupy.diag(cupy.ones((n,), dtype=self.r_dtype))\\n+ for i in range(bs):\\n+ a[i][diag > 0] = 0\\n+ a[i] += diag\\n+ x = self._make_matrix((bs, n, nrhs), 0.2, 0.9)\\n+ b = cupy.matmul(a, x)\\n+ a_shape = (n, n) if self.bs is None else (bs, n, n)\\n+ b_shape = [n]\\n+ if self.bs is not None:\\n+ b_shape.insert(0, bs)\\n+ if self.nrhs is not None:\\n+ b_shape.append(nrhs)\\n+ self.a = a.reshape(a_shape)\\n+ self.b = b.reshape(b_shape)\\n+ self.x_ref = x.reshape(b_shape)\\n+ if self.r_dtype == numpy.float32:\\n+ self.tol = self._tol['f']\\n+ elif self.r_dtype == numpy.float64:\\n+ self.tol = self._tol['d']\\n+\\n+ def test_batched_gesv(self):\\n+ x = cublas.batched_gesv(self.a, self.b)\\n+ cupy.testing.assert_allclose(x, self.x_ref,\\n+ rtol=self.tol, atol=self.tol)\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -54,6 +55,9 @@ def solve(a, b):\n if a.ndim == 2:\n return cupy.cusolver.gesv(a, b)\n \n+ if a.shape[-1] <= 256:","line":null,"original_line":58,"original_start_line":null,"path":"cupy/linalg/solve.py","start_line":null,"text":"@user1:\nIs this cuBLAS's requirement? Could you add a comment here?\n\n@user1:\nAlso, if you wanna hijack late (as is done here), you don't have to call `util._assert_cupy_array()` etc in `batched_gesv` and do the array checks twice. Another option is to hijack sooner and leave `batched_gesv` as is. \n\n@user1:\nOne more question: Is it possible that all of the tests will now go through `batched_gesv` (maybe because the test size is small) and make the main path below untested?\n\n@author:\n> Is this cuBLAS's requirement? Could you add a comment here?\r\n\r\nThis is not a cuBLAS's requirement, but there is a low performance issue in batched getrf routines if matrices are not small..\n\n@author:\n> One more question: Is it possible that all of the tests will now go through batched_gesv (maybe because the test size is small) and make the main path below untested?\r\n\r\nGood point! Maybe, we should add tests with large matrices, like a shape of (2, 512, 512) ?\n\n@author:\nI added a routine that allows you to change the threshold to determine whether or not to use batched_gesv."},{"diff_hunk":"@@ -1004,6 +1022,59 @@ cpdef zgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\n check_status(status)\n \n \n+cpdef int sgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, int batchSize):\n+ cdef int info\n+ _setStream(handle)\n+ with nogil:\n+ status = cublasSgetrsBatched(\n+ <Handle>handle, <Operation>trans, n, nrhs,\n+ <const float**>Aarray, lda, <const int*>devIpiv,\n+ <float**>Barray, ldb, &info, batchSize)\n+ check_status(status)\n+ return info","line":null,"original_line":1036,"original_start_line":null,"path":"cupy_backends/cuda/libs/cublas.pyx","start_line":null,"text":"@user1:\nI think it's better to follow other cuBLAS routines (like `sgetrfBatched` etc) and pass in the info array instead of returning an int here. This return value is not used by your `batched_gesv` anyway.\n\n@author:\nActually I was wondering which was better. My first implementation followed other routine's convention, but changed it to current design as info is a host array with size 1 and it is easier to handle it with current design.\r\nAnyway, I agree that current design is not consistent with other routines. So, I will change it to follow other routines.\n\n@user1:\nOh oh I see what you're saying! In most routines `infoArray` is a device array (of size `batch_size`), but in this case it's a host array of size 1! It's very inconsistent API design...😞 \r\n\r\nAnother inconsistent design is that the batched version lives in cuBLAS but the non-batched version lives in cuSOLVER !@#$%...Otherwise we could just merge `cupy.cublas.batched_gesv` with `cupy.cusolver.gesv`...(Or should we do that anyways?)\n\n@author:\nThere's a historical reason for that: when we first added the Lapack-like routines to the CUDA library, there was no cuSOLVER yet.."}],"string":"[\n {\n \"diff_hunk\": \"@@ -54,6 +55,9 @@ def solve(a, b):\\n if a.ndim == 2:\\n return cupy.cusolver.gesv(a, b)\\n \\n+ if a.shape[-1] <= 256:\",\n \"line\": null,\n \"original_line\": 58,\n \"original_start_line\": null,\n \"path\": \"cupy/linalg/solve.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nIs this cuBLAS's requirement? Could you add a comment here?\\n\\n@user1:\\nAlso, if you wanna hijack late (as is done here), you don't have to call `util._assert_cupy_array()` etc in `batched_gesv` and do the array checks twice. Another option is to hijack sooner and leave `batched_gesv` as is. \\n\\n@user1:\\nOne more question: Is it possible that all of the tests will now go through `batched_gesv` (maybe because the test size is small) and make the main path below untested?\\n\\n@author:\\n> Is this cuBLAS's requirement? Could you add a comment here?\\r\\n\\r\\nThis is not a cuBLAS's requirement, but there is a low performance issue in batched getrf routines if matrices are not small..\\n\\n@author:\\n> One more question: Is it possible that all of the tests will now go through batched_gesv (maybe because the test size is small) and make the main path below untested?\\r\\n\\r\\nGood point! Maybe, we should add tests with large matrices, like a shape of (2, 512, 512) ?\\n\\n@author:\\nI added a routine that allows you to change the threshold to determine whether or not to use batched_gesv.\"\n },\n {\n \"diff_hunk\": \"@@ -1004,6 +1022,59 @@ cpdef zgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\\n check_status(status)\\n \\n \\n+cpdef int sgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\\n+ size_t Aarray, int lda, size_t devIpiv,\\n+ size_t Barray, int ldb, int batchSize):\\n+ cdef int info\\n+ _setStream(handle)\\n+ with nogil:\\n+ status = cublasSgetrsBatched(\\n+ <Handle>handle, <Operation>trans, n, nrhs,\\n+ <const float**>Aarray, lda, <const int*>devIpiv,\\n+ <float**>Barray, ldb, &info, batchSize)\\n+ check_status(status)\\n+ return info\",\n \"line\": null,\n \"original_line\": 1036,\n \"original_start_line\": null,\n \"path\": \"cupy_backends/cuda/libs/cublas.pyx\",\n \"start_line\": null,\n \"text\": \"@user1:\\nI think it's better to follow other cuBLAS routines (like `sgetrfBatched` etc) and pass in the info array instead of returning an int here. This return value is not used by your `batched_gesv` anyway.\\n\\n@author:\\nActually I was wondering which was better. My first implementation followed other routine's convention, but changed it to current design as info is a host array with size 1 and it is easier to handle it with current design.\\r\\nAnyway, I agree that current design is not consistent with other routines. So, I will change it to follow other routines.\\n\\n@user1:\\nOh oh I see what you're saying! In most routines `infoArray` is a device array (of size `batch_size`), but in this case it's a host array of size 1! It's very inconsistent API design...😞 \\r\\n\\r\\nAnother inconsistent design is that the batched version lives in cuBLAS but the non-batched version lives in cuSOLVER !@#$%...Otherwise we could just merge `cupy.cublas.batched_gesv` with `cupy.cusolver.gesv`...(Or should we do that anyways?)\\n\\n@author:\\nThere's a historical reason for that: when we first added the Lapack-like routines to the CUDA library, there was no cuSOLVER yet..\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"427a0a7a4901721841e40135068e072cc9b6c760"},"merged_patch":{"kind":"string","value":"diff --git a/cupy/cublas.py b/cupy/cublas.py\nnew file mode 100644\nindex 00000000000..63043a82df6\n--- /dev/null\n+++ b/cupy/cublas.py\n@@ -0,0 +1,104 @@\n+import numpy\n+from numpy import linalg\n+\n+import warnings\n+\n+import cupy\n+from cupy_backends.cuda.libs import cublas\n+from cupy.cuda import device\n+from cupy.linalg import util\n+\n+_batched_gesv_limit = 256\n+\n+\n+def get_batched_gesv_limit():\n+ global _batched_gesv_limit\n+ return _batched_gesv_limit\n+\n+\n+def set_batched_gesv_limit(limit):\n+ global _batched_gesv_limit\n+ _batched_gesv_limit = limit\n+\n+\n+def batched_gesv(a, b):\n+ \"\"\"Solves multiple linear matrix equations using cublas<t>getr[fs]Batched().\n+\n+ Computes the solution to system of linear equation ``ax = b``.\n+\n+ Args:\n+ a (cupy.ndarray): The matrix with dimension ``(..., M, M)``.\n+ b (cupy.ndarray): The matrix with dimension ``(..., M)`` or\n+ ``(..., M, K)``.\n+\n+ Returns:\n+ cupy.ndarray:\n+ The matrix with dimension ``(..., M)`` or ``(..., M, K)``.\n+ \"\"\"\n+ util._assert_cupy_array(a, b)\n+ util._assert_nd_squareness(a)\n+\n+ if not ((a.ndim == b.ndim or a.ndim == b.ndim + 1) and\n+ a.shape[:-1] == b.shape[:a.ndim - 1]):\n+ raise ValueError(\n+ 'a must have (..., M, M) shape and b must have (..., M) '\n+ 'or (..., M, K)')\n+\n+ dtype = numpy.promote_types(a.dtype.char, 'f')\n+ if dtype == 'f':\n+ t = 's'\n+ elif dtype == 'd':\n+ t = 'd'\n+ elif dtype == 'F':\n+ t = 'c'\n+ elif dtype == 'D':\n+ t = 'z'\n+ else:\n+ raise TypeError('invalid dtype')\n+ getrf = getattr(cublas, t + 'getrfBatched')\n+ getrs = getattr(cublas, t + 'getrsBatched')\n+\n+ bs = numpy.prod(a.shape[:-2]) if a.ndim > 2 else 1\n+ n = a.shape[-1]\n+ nrhs = b.shape[-1] if a.ndim == b.ndim else 1\n+ b_shape = b.shape\n+ a_data_ptr = a.data.ptr\n+ b_data_ptr = b.data.ptr\n+ a = cupy.ascontiguousarray(a.reshape(bs, n, n).transpose(0, 2, 1),\n+ dtype=dtype)\n+ b = cupy.ascontiguousarray(b.reshape(bs, n, nrhs).transpose(0, 2, 1),\n+ dtype=dtype)\n+ if a.data.ptr == a_data_ptr:\n+ a = a.copy()\n+ if b.data.ptr == b_data_ptr:\n+ b = b.copy()\n+\n+ if n > get_batched_gesv_limit():\n+ warnings.warn('The matrix size ({}) exceeds the set limit ({})'.\n+ format(n, get_batched_gesv_limit()))\n+\n+ handle = device.get_cublas_handle()\n+ lda = n\n+ a_step = lda * n * a.itemsize\n+ a_array = cupy.arange(a.data.ptr, a.data.ptr + a_step * bs, a_step,\n+ dtype=cupy.uintp)\n+ ldb = n\n+ b_step = ldb * nrhs * b.itemsize\n+ b_array = cupy.arange(b.data.ptr, b.data.ptr + b_step * bs, b_step,\n+ dtype=cupy.uintp)\n+ pivot = cupy.empty((bs, n), dtype=numpy.int32)\n+ dinfo = cupy.empty((bs,), dtype=numpy.int32)\n+ info = numpy.empty((1,), dtype=numpy.int32)\n+ # LU factorization (A = L * U)\n+ getrf(handle, n, a_array.data.ptr, lda, pivot.data.ptr, dinfo.data.ptr, bs)\n+ util._check_cublas_info_array_if_synchronization_allowed(getrf, dinfo)\n+ # Solves Ax = b\n+ getrs(handle, cublas.CUBLAS_OP_N, n, nrhs, a_array.data.ptr, lda,\n+ pivot.data.ptr, b_array.data.ptr, ldb, info.ctypes.data, bs)\n+ if info[0] != 0:\n+ msg = 'Error reported by {} in cuBLAS. '.format(getrs.__name__)\n+ if info[0] < 0:\n+ msg += 'The {}-th parameter had an illegal value.'.format(-info[0])\n+ raise linalg.LinAlgError(msg)\n+\n+ return b.transpose(0, 2, 1).reshape(b_shape)\ndiff --git a/cupy/linalg/solve.py b/cupy/linalg/solve.py\nindex 78f996bda3c..62c6942ca0f 100644\n--- a/cupy/linalg/solve.py\n+++ b/cupy/linalg/solve.py\n@@ -8,6 +8,7 @@\n from cupy.cuda import device\n from cupy.linalg import decomposition\n from cupy.linalg import util\n+from cupy.cublas import batched_gesv, get_batched_gesv_limit\n \n \n def solve(a, b):\n@@ -34,6 +35,11 @@ def solve(a, b):\n \n .. seealso:: :func:`numpy.linalg.solve`\n \"\"\"\n+ if a.ndim > 2 and a.shape[-1] <= get_batched_gesv_limit():\n+ # Note: There is a low performance issue in batched_gesv when matrix is\n+ # large, so it is not used in such cases.\n+ return batched_gesv(a, b)\n+\n util._assert_cupy_array(a, b)\n util._assert_nd_squareness(a)\n \ndiff --git a/cupy_backends/cuda/hip/cupy_hipblas.h b/cupy_backends/cuda/hip/cupy_hipblas.h\nindex de0b40721b2..44705bbd0b7 100644\n--- a/cupy_backends/cuda/hip/cupy_hipblas.h\n+++ b/cupy_backends/cuda/hip/cupy_hipblas.h\n@@ -663,6 +663,86 @@ cublasStatus_t cublasZgetrfBatched(cublasHandle_t handle, int n, cuDoubleComplex\n PivotArray, infoArray, batchSize);\n }\n \n+cublasStatus_t cublasSgetrsBatched(cublasHandle_t handle,\n+ cublasOperation_t trans,\n+ int n,\n+ int nrhs,\n+ const float *const Aarray[],\n+ int lda,\n+ const int *devIpiv,\n+ float *const Barray[],\n+ int ldb,\n+ int *info,\n+ int batchSize) {\n+ return hipblasSgetrsBatched(handle,\n+ convert_hipblasOperation_t(trans),\n+ n, nrhs,\n+ const_cast<float* const*>(Aarray), lda,\n+ devIpiv,\n+ Barray, ldb,\n+ info, batchSize);\n+}\n+\n+cublasStatus_t cublasDgetrsBatched(cublasHandle_t handle,\n+ cublasOperation_t trans,\n+ int n,\n+ int nrhs,\n+ const double *const Aarray[],\n+ int lda,\n+ const int *devIpiv,\n+ double *const Barray[],\n+ int ldb,\n+ int *info,\n+ int batchSize) {\n+ return hipblasDgetrsBatched(handle,\n+ convert_hipblasOperation_t(trans),\n+ n, nrhs,\n+ const_cast<double* const*>(Aarray), lda,\n+ devIpiv,\n+ Barray, ldb,\n+ info, batchSize);\n+}\n+\n+cublasStatus_t cublasCgetrsBatched(cublasHandle_t handle,\n+ cublasOperation_t trans,\n+ int n,\n+ int nrhs,\n+ const cuComplex *const Aarray[],\n+ int lda,\n+ const int *devIpiv,\n+ cuComplex *const Barray[],\n+ int ldb,\n+ int *info,\n+ int batchSize) {\n+ return hipblasCgetrsBatched(handle,\n+ convert_hipblasOperation_t(trans),\n+ n, nrhs,\n+ reinterpret_cast<hipblasComplex* const*>(const_cast<cuComplex* const*>(Aarray)), lda,\n+ devIpiv,\n+ reinterpret_cast<hipblasComplex* const*>(Barray), ldb,\n+ info, batchSize);\n+}\n+\n+cublasStatus_t cublasZgetrsBatched(cublasHandle_t handle,\n+ cublasOperation_t trans,\n+ int n,\n+ int nrhs,\n+ const cuDoubleComplex** Aarray,\n+ int lda,\n+ const int *devIpiv,\n+ cuDoubleComplex** Barray,\n+ int ldb,\n+ int *info,\n+ int batchSize) {\n+ return hipblasZgetrsBatched(handle,\n+ convert_hipblasOperation_t(trans),\n+ n, nrhs,\n+ reinterpret_cast<hipblasDoubleComplex* const*>(const_cast<cuDoubleComplex* const*>(Aarray)), lda,\n+ devIpiv,\n+ reinterpret_cast<hipblasDoubleComplex* const*>(Barray), ldb,\n+ info, batchSize);\n+}\n+\n } // extern \"C\"\n \n #endif // #ifndef INCLUDE_GUARD_HIP_CUPY_HIPBLAS_H\ndiff --git a/cupy_backends/cuda/libs/cublas.pxd b/cupy_backends/cuda/libs/cublas.pxd\nindex fba04526e30..279ac9b2541 100644\n--- a/cupy_backends/cuda/libs/cublas.pxd\n+++ b/cupy_backends/cuda/libs/cublas.pxd\n@@ -249,6 +249,19 @@ cpdef cgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\n cpdef zgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\n size_t PivotArray, size_t infoArray, int batchSize)\n \n+cpdef int sgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize)\n+cpdef int dgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize)\n+cpdef int cgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize)\n+cpdef int zgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize)\n+\n cpdef sgetriBatched(intptr_t handle, int n, size_t Aarray, int lda,\n size_t PivotArray, size_t Carray, int ldc,\n size_t infoArray, int batchSize)\ndiff --git a/cupy_backends/cuda/libs/cublas.pyx b/cupy_backends/cuda/libs/cublas.pyx\nindex f161efd58de..642841398ef 100644\n--- a/cupy_backends/cuda/libs/cublas.pyx\n+++ b/cupy_backends/cuda/libs/cublas.pyx\n@@ -221,6 +221,24 @@ cdef extern from '../cupy_cublas.h' nogil:\n int cublasZgetrfBatched(\n Handle handle, int n, cuDoubleComplex **Aarray, int lda,\n int *PivotArray, int *infoArray, int batchSize)\n+\n+ int cublasSgetrsBatched(\n+ Handle handle, Operation trans, int n, int nrhs,\n+ const float **Aarray, int lda, const int *devIpiv,\n+ float **Barray, int ldb, int *info, int batchSize)\n+ int cublasDgetrsBatched(\n+ Handle handle, Operation trans, int n, int nrhs,\n+ const double **Aarray, int lda, const int *devIpiv,\n+ double **Barray, int ldb, int *info, int batchSize)\n+ int cublasCgetrsBatched(\n+ Handle handle, Operation trans, int n, int nrhs,\n+ const cuComplex **Aarray, int lda, const int *devIpiv,\n+ cuComplex **Barray, int ldb, int *info, int batchSize)\n+ int cublasZgetrsBatched(\n+ Handle handle, Operation trans, int n, int nrhs,\n+ const cuDoubleComplex **Aarray, int lda, const int *devIpiv,\n+ cuDoubleComplex **Barray, int ldb, int *info, int batchSize)\n+\n int cublasSgetriBatched(\n Handle handle, int n, const float **Aarray, int lda,\n int *PivotArray, float *Carray[], int ldc, int *infoArray,\n@@ -1004,6 +1022,51 @@ cpdef zgetrfBatched(intptr_t handle, int n, size_t Aarray, int lda,\n check_status(status)\n \n \n+cpdef int sgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize):\n+ _setStream(handle)\n+ with nogil:\n+ status = cublasSgetrsBatched(\n+ <Handle>handle, <Operation>trans, n, nrhs,\n+ <const float**>Aarray, lda, <const int*>devIpiv,\n+ <float**>Barray, ldb, <int*>info, batchSize)\n+ check_status(status)\n+\n+cpdef int dgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize):\n+ _setStream(handle)\n+ with nogil:\n+ status = cublasDgetrsBatched(\n+ <Handle>handle, <Operation>trans, n, nrhs,\n+ <const double**>Aarray, lda, <const int*>devIpiv,\n+ <double**>Barray, ldb, <int*>info, batchSize)\n+ check_status(status)\n+\n+cpdef int cgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize):\n+ _setStream(handle)\n+ with nogil:\n+ status = cublasCgetrsBatched(\n+ <Handle>handle, <Operation>trans, n, nrhs,\n+ <const cuComplex**>Aarray, lda, <const int*>devIpiv,\n+ <cuComplex**>Barray, ldb, <int*>info, batchSize)\n+ check_status(status)\n+\n+cpdef int zgetrsBatched(intptr_t handle, int trans, int n, int nrhs,\n+ size_t Aarray, int lda, size_t devIpiv,\n+ size_t Barray, int ldb, size_t info, int batchSize):\n+ _setStream(handle)\n+ with nogil:\n+ status = cublasZgetrsBatched(\n+ <Handle>handle, <Operation>trans, n, nrhs,\n+ <const cuDoubleComplex**>Aarray, lda, <const int*>devIpiv,\n+ <cuDoubleComplex**>Barray, ldb, <int*>info, batchSize)\n+ check_status(status)\n+\n+\n cpdef sgetriBatched(\n intptr_t handle, int n, size_t Aarray, int lda, size_t PivotArray,\n size_t Carray, int ldc, size_t infoArray, int batchSize):\ndiff --git a/cupy_backends/cuda/stub/cupy_cublas.h b/cupy_backends/cuda/stub/cupy_cublas.h\nindex c164d5d7bc0..48ed821e7d4 100644\n--- a/cupy_backends/cuda/stub/cupy_cublas.h\n+++ b/cupy_backends/cuda/stub/cupy_cublas.h\n@@ -250,6 +250,22 @@ cublasStatus_t cublasZgetrfBatched(...) {\n return CUBLAS_STATUS_SUCCESS;\n }\n \n+cublasStatus_t cublasSgetrsBatched(...) {\n+ return CUBLAS_STATUS_SUCCESS;\n+}\n+\n+cublasStatus_t cublasDgetrsBatched(...) {\n+ return CUBLAS_STATUS_SUCCESS;\n+}\n+\n+cublasStatus_t cublasCgetrsBatched(...) {\n+ return CUBLAS_STATUS_SUCCESS;\n+}\n+\n+cublasStatus_t cublasZgetrsBatched(...) {\n+ return CUBLAS_STATUS_SUCCESS;\n+}\n+\n cublasStatus_t cublasSgetriBatched(...) {\n return CUBLAS_STATUS_SUCCESS;\n }\ndiff --git a/tests/cupy_tests/linalg_tests/test_solve.py b/tests/cupy_tests/linalg_tests/test_solve.py\nindex 3b7619baa14..30ba60e087c 100644\n--- a/tests/cupy_tests/linalg_tests/test_solve.py\n+++ b/tests/cupy_tests/linalg_tests/test_solve.py\n@@ -7,12 +7,25 @@\n from cupy import testing\n from cupy.testing import condition\n import cupyx\n+from cupy.cublas import get_batched_gesv_limit, set_batched_gesv_limit\n \n \n+@testing.parameterize(*testing.product({\n+ 'batched_gesv_limit': [None, 0],\n+}))\n @testing.gpu\n @testing.fix_random()\n class TestSolve(unittest.TestCase):\n \n+ def setUp(self):\n+ if self.batched_gesv_limit is not None:\n+ self.old_limit = get_batched_gesv_limit()\n+ set_batched_gesv_limit(self.batched_gesv_limit)\n+\n+ def tearDown(self):\n+ if self.batched_gesv_limit is not None:\n+ set_batched_gesv_limit(self.old_limit)\n+\n @testing.for_dtypes('fdFD')\n # TODO(kataoka): Fix contiguity\n @testing.numpy_cupy_allclose(atol=1e-3, contiguous_check=False)\ndiff --git a/tests/cupy_tests/test_cublas.py b/tests/cupy_tests/test_cublas.py\nnew file mode 100644\nindex 00000000000..1cd7234d7c4\n--- /dev/null\n+++ b/tests/cupy_tests/test_cublas.py\n@@ -0,0 +1,65 @@\n+import unittest\n+\n+import numpy\n+\n+import cupy\n+from cupy import cublas\n+from cupy import testing\n+from cupy.testing import attr\n+\n+\n+@testing.parameterize(*testing.product({\n+ 'dtype': ['float32', 'float64', 'complex64', 'complex128'],\n+ 'n': [10, 33, 100],\n+ 'bs': [None, 1, 10],\n+ 'nrhs': [None, 1, 10],\n+}))\n+@attr.gpu\n+class TestBatchedGesv(unittest.TestCase):\n+ _tol = {'f': 5e-5, 'd': 1e-12}\n+\n+ def _make_random_matrices(self, shape, xp):\n+ a = testing.shaped_random(shape, xp, dtype=self.r_dtype, scale=1)\n+ if self.dtype.char in 'FD':\n+ a = a + 1j * testing.shaped_random(shape, xp, dtype=self.r_dtype,\n+ scale=1)\n+ return a\n+\n+ def _make_well_conditioned_matrices(self, shape):\n+ a = self._make_random_matrices(shape, numpy)\n+ u, s, vh = numpy.linalg.svd(a)\n+ s = testing.shaped_random(s.shape, numpy, dtype=self.r_dtype,\n+ scale=1) + 1\n+ a = numpy.einsum('...ik,...k,...kj->...ij', u, s, vh)\n+ return cupy.array(a)\n+\n+ def setUp(self):\n+ self.dtype = numpy.dtype(self.dtype)\n+ if self.dtype.char in 'fF':\n+ self.r_dtype = numpy.float32\n+ else:\n+ self.r_dtype = numpy.float64\n+ n = self.n\n+ bs = 1 if self.bs is None else self.bs\n+ nrhs = 1 if self.nrhs is None else self.nrhs\n+ a = self._make_well_conditioned_matrices((bs, n, n))\n+ x = self._make_random_matrices((bs, n, nrhs), cupy)\n+ b = cupy.matmul(a, x)\n+ a_shape = (n, n) if self.bs is None else (bs, n, n)\n+ b_shape = [n]\n+ if self.bs is not None:\n+ b_shape.insert(0, bs)\n+ if self.nrhs is not None:\n+ b_shape.append(nrhs)\n+ self.a = a.reshape(a_shape)\n+ self.b = b.reshape(b_shape)\n+ self.x_ref = x.reshape(b_shape)\n+ if self.r_dtype == numpy.float32:\n+ self.tol = self._tol['f']\n+ elif self.r_dtype == numpy.float64:\n+ self.tol = self._tol['d']\n+\n+ def test_batched_gesv(self):\n+ x = cublas.batched_gesv(self.a, self.b)\n+ cupy.testing.assert_allclose(x, self.x_ref,\n+ rtol=self.tol, atol=self.tol)\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"high\",\n \"estimated_review_effort\": 4,\n \"problem_domain\": \"Performance Optimizations\"\n}"}}},{"rowIdx":2386,"cells":{"instance_id":{"kind":"string","value":"deepset-ai__haystack-4159@aa5341d"},"repo":{"kind":"string","value":"deepset-ai/haystack"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":4159,"string":"4,159"},"title":{"kind":"string","value":"feat: add `top_k` to `PromptNode`"},"body":{"kind":"string","value":"### Related Issues\r\n- fixes https://github.com/deepset-ai/haystack/issues/4158\r\n\r\n### Proposed Changes:\r\n- add `top_k` parameter to `PromptNode`\r\n- push down `top_k` to invocation layers and map them to their invocation interface\r\n\r\n### How did you test it?\r\n- added tests\r\n\r\n### Notes for the reviewer\r\n- I don't know why `test/nodes/test_audio.py::TestTextToSpeech::test_text_to_speech_compress_audio` fails. The code didn't touch any of TestToSpeech. Also other PR CIs are failing because of this. Maybe a dependency update?...\r\n\r\n### Checklist\r\n- [x] I have read the [contributors guidelines](https://github.com/deepset-ai/haystack/blob/main/CONTRIBUTING.md) and the [code of conduct](https://github.com/deepset-ai/haystack/blob/main/code_of_conduct.txt)\r\n- [x] I have updated the related issue with new insights and changes\r\n- [x] I added tests that demonstrate the correct behavior of the change\r\n- [x] I've used one of the [conventional commit types](https://www.conventionalcommits.org/en/v1.0.0/) for my PR title: `fix:`, `feat:`, `build:`, `chore:`, `ci:`, `docs:`, `style:`, `refactor:`, `perf:`, `test:`.\r\n- [x] I documented my code\r\n- [x] I ran [pre-commit hooks](https://github.com/deepset-ai/haystack/blob/main/CONTRIBUTING.md#installation) and fixed any issue\r\n"},"created_at":{"kind":"string","value":"2023-02-14T17:56:39Z"},"problem_statement":{"kind":"string","value":"Add `top_k` to `PromptNode`\n**Is your feature request related to a problem? Please describe.**\r\nSetting top_k on `PromptNode` is quite cumbersome. Depending on which invocation context you use, you have to set different params on `PromptModel`:\r\n***For hf models:***\r\n```yaml\r\n....\r\n - name: my_prompt_model\r\n type: PromptModel\r\n params:\r\n model_name_or_path: google/flan-t5-large\r\n model_kwargs:\r\n model_kwargs:\r\n num_return_sequences: 3\r\n num_beams: 3\r\n....\r\n```\r\n***For OpenAI models:***\r\n```yaml\r\n...\r\n - name: my_prompt_model\r\n type: PromptModel\r\n params:\r\n model_name_or_path: text-davinci-003\r\n model_kwargs:\r\n n: 3\r\n best_of: 3\r\n...\r\n```\r\n\r\n`PromptNode` misses the functionality to set `top_k` completely. This is a problem if you want to use the same `PromptModel` with different `PromptNodes` (i.e. for different use-cases), that require differnt `top_k`.\r\n\r\n**Describe the solution you'd like**\r\n- Add `top_k` param to `PromptNode`\r\n- push down `top_k` to the invocation layers\r\n\r\n**Describe alternatives you've considered**\r\n- make `top_k` part of `PromptTemplate`: it's not the right place, as with `PromptTemplate you specify the use-case in general, but not the instance of a use-case. `top_k` should be part of the instance of a use-case and thus part of `PromptNode`"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"**Is your feature request related to a problem? Please describe.**\r\nSetting top_k on `PromptNode` is quite cumbersome. Depending on which invocation context you use, you have to set different params on `PromptModel`:\r\n***For hf models:***\r\n```yaml\r\n....\r\n - name: my_prompt_model\r\n type: PromptModel\r\n params:\r\n model_name_or_path: google/flan-t5-large\r\n model_kwargs:\r\n model_kwargs:\r\n num_return_sequences: 3\r\n num_beams: 3\r\n....\r\n```\r\n***For OpenAI models:***\r\n```yaml\r\n...\r\n - name: my_prompt_model\r\n type: PromptModel\r\n params:\r\n model_name_or_path: text-davinci-003\r\n model_kwargs:\r\n n: 3\r\n best_of: 3\r\n...\r\n```\r\n\r\n`PromptNode` misses the functionality to set `top_k` completely. This is a problem if you want to use the same `PromptModel` with different `PromptNodes` (i.e. for different use-cases), that require differnt `top_k`.\r\n\r\n**Describe the solution you'd like**\r\n- Add `top_k` param to `PromptNode`\r\n- push down `top_k` to the invocation layers\r\n\r\n**Describe alternatives you've considered**\r\n- make `top_k` part of `PromptTemplate`: it's not the right place, as with `PromptTemplate you specify the use-case in general, but not the instance of a use-case. `top_k` should be part of the instance of a use-case and thus part of `PromptNode`\r\n","number":4158,"title":"Add `top_k` to `PromptNode`"}],"string":"[\n {\n \"body\": \"**Is your feature request related to a problem? Please describe.**\\r\\nSetting top_k on `PromptNode` is quite cumbersome. Depending on which invocation context you use, you have to set different params on `PromptModel`:\\r\\n***For hf models:***\\r\\n```yaml\\r\\n....\\r\\n - name: my_prompt_model\\r\\n type: PromptModel\\r\\n params:\\r\\n model_name_or_path: google/flan-t5-large\\r\\n model_kwargs:\\r\\n model_kwargs:\\r\\n num_return_sequences: 3\\r\\n num_beams: 3\\r\\n....\\r\\n```\\r\\n***For OpenAI models:***\\r\\n```yaml\\r\\n...\\r\\n - name: my_prompt_model\\r\\n type: PromptModel\\r\\n params:\\r\\n model_name_or_path: text-davinci-003\\r\\n model_kwargs:\\r\\n n: 3\\r\\n best_of: 3\\r\\n...\\r\\n```\\r\\n\\r\\n`PromptNode` misses the functionality to set `top_k` completely. This is a problem if you want to use the same `PromptModel` with different `PromptNodes` (i.e. for different use-cases), that require differnt `top_k`.\\r\\n\\r\\n**Describe the solution you'd like**\\r\\n- Add `top_k` param to `PromptNode`\\r\\n- push down `top_k` to the invocation layers\\r\\n\\r\\n**Describe alternatives you've considered**\\r\\n- make `top_k` part of `PromptTemplate`: it's not the right place, as with `PromptTemplate you specify the use-case in general, but not the instance of a use-case. `top_k` should be part of the instance of a use-case and thus part of `PromptNode`\\r\\n\",\n \"number\": 4158,\n \"title\": \"Add `top_k` to `PromptNode`\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"d129598203c551ed705c94307f5d9d4b09d1964f"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"aa5341d0ad637bd3da242bba70b9000fc7bf3a62\",\n \"head_commit_message\": \"add top_k to PromptNode\",\n \"patch_to_review\": \"diff --git a/haystack/nodes/prompt/prompt_node.py b/haystack/nodes/prompt/prompt_node.py\\nindex 520c755912..a346e73467 100644\\n--- a/haystack/nodes/prompt/prompt_node.py\\n+++ b/haystack/nodes/prompt/prompt_node.py\\n@@ -333,6 +333,7 @@ def invoke(self, *args, **kwargs):\\n \\\"\\\"\\\"\\n output: List[Dict[str, str]] = []\\n stop_words = kwargs.pop(\\\"stop_words\\\", None)\\n+ top_k = kwargs.pop(\\\"top_k\\\", None)\\n if kwargs and \\\"prompt\\\" in kwargs:\\n prompt = kwargs.pop(\\\"prompt\\\")\\n \\n@@ -347,6 +348,9 @@ def invoke(self, *args, **kwargs):\\n if stop_words:\\n sw = StopWordsCriteria(tokenizer=self.pipe.tokenizer, stop_words=stop_words)\\n model_input_kwargs[\\\"stopping_criteria\\\"] = StoppingCriteriaList([sw])\\n+ if top_k:\\n+ model_input_kwargs[\\\"num_return_sequences\\\"] = top_k\\n+ model_input_kwargs[\\\"num_beams\\\"] = top_k\\n output = self.pipe(prompt, max_length=self.max_length, **model_input_kwargs)\\n generated_texts = [o[\\\"generated_text\\\"] for o in output if \\\"generated_text\\\" in o]\\n \\n@@ -459,6 +463,8 @@ def invoke(self, *args, **kwargs):\\n # we use keyword stop_words but OpenAI uses stop\\n if \\\"stop_words\\\" in kwargs:\\n kwargs[\\\"stop\\\"] = kwargs.pop(\\\"stop_words\\\")\\n+ if \\\"top_k\\\" in kwargs:\\n+ kwargs[\\\"n\\\"] = kwargs.pop(\\\"top_k\\\")\\n kwargs_with_defaults.update(kwargs)\\n payload = {\\n \\\"model\\\": self.model_name_or_path,\\n@@ -711,6 +717,7 @@ def __init__(\\n use_gpu: Optional[bool] = None,\\n devices: Optional[List[Union[str, torch.device]]] = None,\\n stop_words: Optional[List[str]] = None,\\n+ top_k: int = 1,\\n ):\\n \\\"\\\"\\\"\\n Creates a PromptNode instance.\\n@@ -723,6 +730,7 @@ def __init__(\\n :param use_auth_token: The authentication token to use for the model.\\n :param use_gpu: Whether to use GPU or not.\\n :param devices: The devices to use for the model.\\n+ :param top_k: Number of independently generated text to return per prompt.\\n \\\"\\\"\\\"\\n super().__init__()\\n self.prompt_templates: Dict[str, PromptTemplate] = {pt.name: pt for pt in get_predefined_prompt_templates()} # type: ignore\\n@@ -731,6 +739,7 @@ def __init__(\\n self.model_name_or_path: Union[str, PromptModel] = model_name_or_path\\n self.prompt_model: PromptModel\\n self.stop_words: Optional[List[str]] = stop_words\\n+ self.top_k: int = top_k\\n if isinstance(self.default_prompt_template, str) and not self.is_supported_template(\\n self.default_prompt_template\\n ):\\n@@ -979,4 +988,4 @@ def run_batch(\\n def _prepare_model_kwargs(self):\\n # these are the parameters from PromptNode level\\n # that are passed to the prompt model invocation layer\\n- return {\\\"stop_words\\\": self.stop_words}\\n+ return {\\\"stop_words\\\": self.stop_words, \\\"top_k\\\": self.top_k}\\ndiff --git a/test/nodes/test_prompt_node.py b/test/nodes/test_prompt_node.py\\nindex f53b1a5bdb..5da8f6ff98 100644\\n--- a/test/nodes/test_prompt_node.py\\n+++ b/test/nodes/test_prompt_node.py\\n@@ -7,6 +7,7 @@\\n \\n from haystack import Document, Pipeline, BaseComponent, MultiLabel\\n from haystack.errors import OpenAIError\\n+from haystack.nodes.other.shaper import Shaper\\n from haystack.nodes.prompt import PromptTemplate, PromptNode, PromptModel\\n from haystack.nodes.prompt.prompt_node import HFLocalInvocationLayer\\n \\n@@ -329,6 +330,22 @@ def test_complex_pipeline(prompt_model):\\n assert \\\"berlin\\\" in result[\\\"results\\\"][0].casefold()\\n \\n \\n+@pytest.mark.integration\\n+@pytest.mark.parametrize(\\\"prompt_model\\\", [\\\"hf\\\", \\\"openai\\\"], indirect=True)\\n+def test_simple_pipeline_with_topk(prompt_model):\\n+ if prompt_model.api_key is not None and not is_openai_api_key_set(prompt_model.api_key):\\n+ pytest.skip(\\\"No API key found for OpenAI, skipping test\\\")\\n+\\n+ node = PromptNode(prompt_model, default_prompt_template=\\\"question-generation\\\", top_k=2)\\n+\\n+ pipe = Pipeline()\\n+ pipe.add_node(component=node, name=\\\"prompt_node\\\", inputs=[\\\"Query\\\"])\\n+ result = pipe.run(query=\\\"not relevant\\\", documents=[Document(\\\"Berlin is the capital of Germany\\\")])\\n+\\n+ assert len(result[\\\"results\\\"]) == 2\\n+ assert result[\\\"results\\\"][0] != result[\\\"results\\\"][1]\\n+\\n+\\n @pytest.mark.integration\\n @pytest.mark.parametrize(\\\"prompt_model\\\", [\\\"hf\\\", \\\"openai\\\"], indirect=True)\\n def test_complex_pipeline_with_qa(prompt_model):\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -459,6 +463,8 @@ def invoke(self, *args, **kwargs):\n # we use keyword stop_words but OpenAI uses stop\n if \"stop_words\" in kwargs:\n kwargs[\"stop\"] = kwargs.pop(\"stop_words\")\n+ if \"top_k\" in kwargs:\n+ kwargs[\"n\"] = kwargs.pop(\"top_k\")","line":null,"original_line":467,"original_start_line":466,"path":"haystack/nodes/prompt/prompt_node.py","start_line":null,"text":"@author:\nHandling in `OpenAIInvocationLayer`"}],"string":"[\n {\n \"diff_hunk\": \"@@ -459,6 +463,8 @@ def invoke(self, *args, **kwargs):\\n # we use keyword stop_words but OpenAI uses stop\\n if \\\"stop_words\\\" in kwargs:\\n kwargs[\\\"stop\\\"] = kwargs.pop(\\\"stop_words\\\")\\n+ if \\\"top_k\\\" in kwargs:\\n+ kwargs[\\\"n\\\"] = kwargs.pop(\\\"top_k\\\")\",\n \"line\": null,\n \"original_line\": 467,\n \"original_start_line\": 466,\n \"path\": \"haystack/nodes/prompt/prompt_node.py\",\n \"start_line\": null,\n \"text\": \"@author:\\nHandling in `OpenAIInvocationLayer`\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"79f8f13f29471b69355cd3d4b799876c5013ba7d"},"merged_patch":{"kind":"string","value":"diff --git a/haystack/nodes/prompt/prompt_node.py b/haystack/nodes/prompt/prompt_node.py\nindex 39f94b5d2a..01e2d2d111 100644\n--- a/haystack/nodes/prompt/prompt_node.py\n+++ b/haystack/nodes/prompt/prompt_node.py\n@@ -337,6 +337,7 @@ def invoke(self, *args, **kwargs):\n \"\"\"\n output: List[Dict[str, str]] = []\n stop_words = kwargs.pop(\"stop_words\", None)\n+ top_k = kwargs.pop(\"top_k\", None)\n if kwargs and \"prompt\" in kwargs:\n prompt = kwargs.pop(\"prompt\")\n \n@@ -351,6 +352,9 @@ def invoke(self, *args, **kwargs):\n if stop_words:\n sw = StopWordsCriteria(tokenizer=self.pipe.tokenizer, stop_words=stop_words)\n model_input_kwargs[\"stopping_criteria\"] = StoppingCriteriaList([sw])\n+ if top_k:\n+ model_input_kwargs[\"num_return_sequences\"] = top_k\n+ model_input_kwargs[\"num_beams\"] = top_k\n output = self.pipe(prompt, max_length=self.max_length, **model_input_kwargs)\n generated_texts = [o[\"generated_text\"] for o in output if \"generated_text\" in o]\n \n@@ -464,6 +468,10 @@ def invoke(self, *args, **kwargs):\n # we use keyword stop_words but OpenAI uses stop\n if \"stop_words\" in kwargs:\n kwargs[\"stop\"] = kwargs.pop(\"stop_words\")\n+ if \"top_k\" in kwargs:\n+ top_k = kwargs.pop(\"top_k\")\n+ kwargs[\"n\"] = top_k\n+ kwargs[\"best_of\"] = top_k\n kwargs_with_defaults.update(kwargs)\n payload = {\n \"model\": self.model_name_or_path,\n@@ -722,6 +730,7 @@ def __init__(\n use_gpu: Optional[bool] = None,\n devices: Optional[List[Union[str, torch.device]]] = None,\n stop_words: Optional[List[str]] = None,\n+ top_k: int = 1,\n model_kwargs: Optional[Dict] = None,\n ):\n \"\"\"\n@@ -735,6 +744,7 @@ def __init__(\n :param use_auth_token: The authentication token to use for the model.\n :param use_gpu: Whether to use GPU or not.\n :param devices: The devices to use for the model.\n+ :param top_k: Number of independently generated text to return per prompt.\n :param stop_words: Stops text generation if any one of the stop words is generated.\n :param model_kwargs: Additional keyword arguments passed when loading the model specified by `model_name_or_path`.\n \"\"\"\n@@ -745,6 +755,7 @@ def __init__(\n self.model_name_or_path: Union[str, PromptModel] = model_name_or_path\n self.prompt_model: PromptModel\n self.stop_words: Optional[List[str]] = stop_words\n+ self.top_k: int = top_k\n if isinstance(self.default_prompt_template, str) and not self.is_supported_template(\n self.default_prompt_template\n ):\n@@ -1017,7 +1028,7 @@ def run_batch( # type: ignore\n def _prepare_model_kwargs(self):\n # these are the parameters from PromptNode level\n # that are passed to the prompt model invocation layer\n- return {\"stop_words\": self.stop_words}\n+ return {\"stop_words\": self.stop_words, \"top_k\": self.top_k}\n \n @staticmethod\n def _flatten_inputs(\ndiff --git a/test/nodes/test_prompt_node.py b/test/nodes/test_prompt_node.py\nindex 6f9ab847b6..2cbae4f2f1 100644\n--- a/test/nodes/test_prompt_node.py\n+++ b/test/nodes/test_prompt_node.py\n@@ -344,6 +344,21 @@ def test_complex_pipeline(prompt_model):\n assert \"berlin\" in result[\"results\"][0].casefold()\n \n \n+@pytest.mark.integration\n+@pytest.mark.parametrize(\"prompt_model\", [\"hf\", \"openai\"], indirect=True)\n+def test_simple_pipeline_with_topk(prompt_model):\n+ if prompt_model.api_key is not None and not is_openai_api_key_set(prompt_model.api_key):\n+ pytest.skip(\"No API key found for OpenAI, skipping test\")\n+\n+ node = PromptNode(prompt_model, default_prompt_template=\"question-generation\", top_k=2)\n+\n+ pipe = Pipeline()\n+ pipe.add_node(component=node, name=\"prompt_node\", inputs=[\"Query\"])\n+ result = pipe.run(query=\"not relevant\", documents=[Document(\"Berlin is the capital of Germany\")])\n+\n+ assert len(result[\"results\"]) == 2\n+\n+\n @pytest.mark.integration\n @pytest.mark.parametrize(\"prompt_model\", [\"hf\", \"openai\"], indirect=True)\n def test_complex_pipeline_with_qa(prompt_model):\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2387,"cells":{"instance_id":{"kind":"string","value":"crewAIInc__crewAI-2604@d079e36"},"repo":{"kind":"string","value":"crewAIInc/crewAI"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":2604,"string":"2,604"},"title":{"kind":"string","value":"Fix Mem0 OSS"},"body":{"kind":"string","value":"Closes https://github.com/crewAIInc/crewAI/issues/2599"},"created_at":{"kind":"string","value":"2025-04-14T16:48:41Z"},"problem_statement":{"kind":"string","value":"[BUG] Mem0 (local config) - Memory.search() got an unexpected keyword argument 'metadata'\n### Description\n\nI am currently using local mem0 with the following config\n```\nlocal_mem0_config = {\n \"vector_store\": {\n \"provider\": \"qdrant\",\n \"config\": {\n \"collection_name\": \"user_memory\",\n \"host\": \"192.168.0.222\",\n \"port\": 6333,\n \"embedding_model_dims\": \"1536\",\n },\n },\n \"llm\": {\n \"provider\": \"openai\",\n \"config\": {\"api_key\": os.getenv(\"OPENAI_API_KEY\"), \"model\": \"gpt-4o-mini\"},\n },\n \"embedder\": {\n \"provider\": \"openai\",\n \"config\": {\n \"api_key\": os.getenv(\"OPENAI_API_KEY\"),\n \"model\": \"text-embedding-3-small\",\n },\n },\n }\n```\n\nMy crew is defined as this\n```\nCrew(\n agents=self.agents,\n tasks=self.tasks,\n process=Process.sequential,\n verbose=True,\n memory=True,\n external_memory=ExternalMemory(\n embedder_config={\n \"provider\": \"mem0\",\n \"config\": {\n \"user_id\": \"jainish\",\n \"local_mem0_config\": self.local_mem0_config,\n },\n }\n ),\n output_log_file=\"logs.json\",\n )\n```\n\nThe full traceback\n```\nTraceback (most recent call last):\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 27, in run_crew\n result = crew.kickoff(inputs=inputs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 646, in kickoff\n result = self._run_sequential_process()\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 758, in _run_sequential_process\n return self._execute_tasks(self.tasks)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 861, in _execute_tasks\n task_output = task.execute_sync(\n ^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 149, in wrap_task_execute\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 328, in execute_sync\n return self._execute_core(agent, context, tools)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 472, in _execute_core\n raise e # Re-raise the exception after emitting the event\n ^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 392, in _execute_core\n result = agent.execute_task(\n ^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 108, in wrap_agent_execute_task\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/agent.py\", line 212, in execute_task\n memory = contextual_memory.build_context_for_task(task, context)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 46, in build_context_for_task\n context.append(self._fetch_external_context(query))\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 130, in _fetch_external_context\n external_memories = self.exm.search(query)\n ^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/memory.py\", line 37, in search\n return self.storage.search(\n ^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/storage/mem0_storage.py\", line 119, in search\n results = self.memory.search(**params)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nTypeError: Memory.search() got an unexpected keyword argument 'metadata'\n```\n\nThe payload of mem0 has changed in v2 compared to v1 but can't find out any major difference as the older version should work as it is (\"version\": \"v1.1\" added in config).\n\n\n\n### Steps to Reproduce\n\n1. Create any crew which uses external memory with mem0 provider as shown above.\n2. Run the crew.\n\n### Expected behavior\n\nThe local mem0 search functionality should work as it does with the cloud one. \nI am using qdrant for my vector store.\n\n### Screenshots/Code snippets\n\nNone\n\n### Operating System\n\nmacOS Sonoma\n\n### Python Version\n\n3.11\n\n### crewAI Version\n\n0.114.0\n\n### crewAI Tools Version\n\n0.40.1\n\n### Virtual Environment\n\nVenv\n\n### Evidence\n\nTraceback (most recent call last):\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 27, in run_crew\n result = crew.kickoff(inputs=inputs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 646, in kickoff\n result = self._run_sequential_process()\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 758, in _run_sequential_process\n return self._execute_tasks(self.tasks)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 861, in _execute_tasks\n task_output = task.execute_sync(\n ^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 149, in wrap_task_execute\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 328, in execute_sync\n return self._execute_core(agent, context, tools)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 472, in _execute_core\n raise e # Re-raise the exception after emitting the event\n ^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 392, in _execute_core\n result = agent.execute_task(\n ^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 108, in wrap_agent_execute_task\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/agent.py\", line 212, in execute_task\n memory = contextual_memory.build_context_for_task(task, context)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 46, in build_context_for_task\n context.append(self._fetch_external_context(query))\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 130, in _fetch_external_context\n external_memories = self.exm.search(query)\n ^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/memory.py\", line 37, in search\n return self.storage.search(\n ^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/storage/mem0_storage.py\", line 119, in search\n results = self.memory.search(**params)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nTypeError: Memory.search() got an unexpected keyword argument 'metadata'\n\nDuring handling of the above exception, another exception occurred:\n\nTraceback (most recent call last):\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 40, in <module>\n run_crew()\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 34, in run_crew\n print(f\"\\nAn error occurred: {e.with_traceback()}\")\n\n### Possible Solution\n\nNone\n\n### Additional context\n\nNone"},"hints_text":{"kind":"string","value":"Hi @Jainish-S,\nI think there is one bug associated with the use of local_mem0_config, \n\nThis is the issue, #2587. the local config parameter is not being passed currently to the `Mem0` class. \n@Vidit-Ostwal Yes I had found it earlier and have fixed it locally. \n> [@Vidit-Ostwal](https://github.com/Vidit-Ostwal) Yes I had found it earlier and have fixed it locally.\n\n@Jainish-S still the issue is there?\n\n@Vidit-Ostwal Yes the issue is still persistent when using local mem0, this doesn't arise when using the mem0 cloud provider config\n@Jainish-S It happens when you don't set the api_key - I'll work in a solution for it this week\n@lucasgomide, is this because `MemoryClient` and `Memory` have a different input parameter?\n@lucasgomide If you don't mind, can I pick this up?\nI think the solution is quite simple, just took a look at the `search` method for both `Memory` and `MemoryClient`.\nand check on the type of object `self.memory` is?\n> @lucasgomide If you don't mind, can I pick this up?\n> I think the solution is quite simple, just took a look at the `search` method for both `Memory` and `MemoryClient`.\n> and check on the type of object `self.memory` is?\n\nSure man, thank u so much..\n@Vidit-Ostwal I think this PR handles that, right? https://github.com/crewAIInc/crewAI/pull/2604\n> [@Vidit-Ostwal](https://github.com/Vidit-Ostwal) I think this PR handles that, right? [#2604](https://github.com/crewAIInc/crewAI/pull/2604)\n\nI think so. The author @Dev-Khant, is the maintainer of mem0 itself. I think he pretty much knows what actually the issue is and the best way to resolve that as well.\nThanks for collaborating on this issue."},"resolved_issues":{"kind":"list like","value":[{"body":"### Description\n\nI am currently using local mem0 with the following config\n```\nlocal_mem0_config = {\n \"vector_store\": {\n \"provider\": \"qdrant\",\n \"config\": {\n \"collection_name\": \"user_memory\",\n \"host\": \"192.168.0.222\",\n \"port\": 6333,\n \"embedding_model_dims\": \"1536\",\n },\n },\n \"llm\": {\n \"provider\": \"openai\",\n \"config\": {\"api_key\": os.getenv(\"OPENAI_API_KEY\"), \"model\": \"gpt-4o-mini\"},\n },\n \"embedder\": {\n \"provider\": \"openai\",\n \"config\": {\n \"api_key\": os.getenv(\"OPENAI_API_KEY\"),\n \"model\": \"text-embedding-3-small\",\n },\n },\n }\n```\n\nMy crew is defined as this\n```\nCrew(\n agents=self.agents,\n tasks=self.tasks,\n process=Process.sequential,\n verbose=True,\n memory=True,\n external_memory=ExternalMemory(\n embedder_config={\n \"provider\": \"mem0\",\n \"config\": {\n \"user_id\": \"jainish\",\n \"local_mem0_config\": self.local_mem0_config,\n },\n }\n ),\n output_log_file=\"logs.json\",\n )\n```\n\nThe full traceback\n```\nTraceback (most recent call last):\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 27, in run_crew\n result = crew.kickoff(inputs=inputs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 646, in kickoff\n result = self._run_sequential_process()\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 758, in _run_sequential_process\n return self._execute_tasks(self.tasks)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 861, in _execute_tasks\n task_output = task.execute_sync(\n ^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 149, in wrap_task_execute\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 328, in execute_sync\n return self._execute_core(agent, context, tools)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 472, in _execute_core\n raise e # Re-raise the exception after emitting the event\n ^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 392, in _execute_core\n result = agent.execute_task(\n ^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 108, in wrap_agent_execute_task\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/agent.py\", line 212, in execute_task\n memory = contextual_memory.build_context_for_task(task, context)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 46, in build_context_for_task\n context.append(self._fetch_external_context(query))\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 130, in _fetch_external_context\n external_memories = self.exm.search(query)\n ^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/memory.py\", line 37, in search\n return self.storage.search(\n ^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/storage/mem0_storage.py\", line 119, in search\n results = self.memory.search(**params)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nTypeError: Memory.search() got an unexpected keyword argument 'metadata'\n```\n\nThe payload of mem0 has changed in v2 compared to v1 but can't find out any major difference as the older version should work as it is (\"version\": \"v1.1\" added in config).\n\n\n\n### Steps to Reproduce\n\n1. Create any crew which uses external memory with mem0 provider as shown above.\n2. Run the crew.\n\n### Expected behavior\n\nThe local mem0 search functionality should work as it does with the cloud one. \nI am using qdrant for my vector store.\n\n### Screenshots/Code snippets\n\nNone\n\n### Operating System\n\nmacOS Sonoma\n\n### Python Version\n\n3.11\n\n### crewAI Version\n\n0.114.0\n\n### crewAI Tools Version\n\n0.40.1\n\n### Virtual Environment\n\nVenv\n\n### Evidence\n\nTraceback (most recent call last):\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 27, in run_crew\n result = crew.kickoff(inputs=inputs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 646, in kickoff\n result = self._run_sequential_process()\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 758, in _run_sequential_process\n return self._execute_tasks(self.tasks)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\", line 861, in _execute_tasks\n task_output = task.execute_sync(\n ^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 149, in wrap_task_execute\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 328, in execute_sync\n return self._execute_core(agent, context, tools)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 472, in _execute_core\n raise e # Re-raise the exception after emitting the event\n ^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\", line 392, in _execute_core\n result = agent.execute_task(\n ^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 61, in wrapper\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\", line 108, in wrap_agent_execute_task\n result = wrapped(*args, **kwargs)\n ^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/agent.py\", line 212, in execute_task\n memory = contextual_memory.build_context_for_task(task, context)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 46, in build_context_for_task\n context.append(self._fetch_external_context(query))\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\", line 130, in _fetch_external_context\n external_memories = self.exm.search(query)\n ^^^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/memory.py\", line 37, in search\n return self.storage.search(\n ^^^^^^^^^^^^^^^^^^^^\n File \"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/storage/mem0_storage.py\", line 119, in search\n results = self.memory.search(**params)\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nTypeError: Memory.search() got an unexpected keyword argument 'metadata'\n\nDuring handling of the above exception, another exception occurred:\n\nTraceback (most recent call last):\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 40, in <module>\n run_crew()\n File \"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\", line 34, in run_crew\n print(f\"\\nAn error occurred: {e.with_traceback()}\")\n\n### Possible Solution\n\nNone\n\n### Additional context\n\nNone","number":2599,"title":"[BUG] Mem0 (local config) - Memory.search() got an unexpected keyword argument 'metadata'"}],"string":"[\n {\n \"body\": \"### Description\\n\\nI am currently using local mem0 with the following config\\n```\\nlocal_mem0_config = {\\n \\\"vector_store\\\": {\\n \\\"provider\\\": \\\"qdrant\\\",\\n \\\"config\\\": {\\n \\\"collection_name\\\": \\\"user_memory\\\",\\n \\\"host\\\": \\\"192.168.0.222\\\",\\n \\\"port\\\": 6333,\\n \\\"embedding_model_dims\\\": \\\"1536\\\",\\n },\\n },\\n \\\"llm\\\": {\\n \\\"provider\\\": \\\"openai\\\",\\n \\\"config\\\": {\\\"api_key\\\": os.getenv(\\\"OPENAI_API_KEY\\\"), \\\"model\\\": \\\"gpt-4o-mini\\\"},\\n },\\n \\\"embedder\\\": {\\n \\\"provider\\\": \\\"openai\\\",\\n \\\"config\\\": {\\n \\\"api_key\\\": os.getenv(\\\"OPENAI_API_KEY\\\"),\\n \\\"model\\\": \\\"text-embedding-3-small\\\",\\n },\\n },\\n }\\n```\\n\\nMy crew is defined as this\\n```\\nCrew(\\n agents=self.agents,\\n tasks=self.tasks,\\n process=Process.sequential,\\n verbose=True,\\n memory=True,\\n external_memory=ExternalMemory(\\n embedder_config={\\n \\\"provider\\\": \\\"mem0\\\",\\n \\\"config\\\": {\\n \\\"user_id\\\": \\\"jainish\\\",\\n \\\"local_mem0_config\\\": self.local_mem0_config,\\n },\\n }\\n ),\\n output_log_file=\\\"logs.json\\\",\\n )\\n```\\n\\nThe full traceback\\n```\\nTraceback (most recent call last):\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\\\", line 27, in run_crew\\n result = crew.kickoff(inputs=inputs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\\\", line 646, in kickoff\\n result = self._run_sequential_process()\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\\\", line 758, in _run_sequential_process\\n return self._execute_tasks(self.tasks)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\\\", line 861, in _execute_tasks\\n task_output = task.execute_sync(\\n ^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 61, in wrapper\\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 149, in wrap_task_execute\\n result = wrapped(*args, **kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\\\", line 328, in execute_sync\\n return self._execute_core(agent, context, tools)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\\\", line 472, in _execute_core\\n raise e # Re-raise the exception after emitting the event\\n ^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\\\", line 392, in _execute_core\\n result = agent.execute_task(\\n ^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 61, in wrapper\\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 108, in wrap_agent_execute_task\\n result = wrapped(*args, **kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/agent.py\\\", line 212, in execute_task\\n memory = contextual_memory.build_context_for_task(task, context)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\\\", line 46, in build_context_for_task\\n context.append(self._fetch_external_context(query))\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\\\", line 130, in _fetch_external_context\\n external_memories = self.exm.search(query)\\n ^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/memory.py\\\", line 37, in search\\n return self.storage.search(\\n ^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/storage/mem0_storage.py\\\", line 119, in search\\n results = self.memory.search(**params)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\nTypeError: Memory.search() got an unexpected keyword argument 'metadata'\\n```\\n\\nThe payload of mem0 has changed in v2 compared to v1 but can't find out any major difference as the older version should work as it is (\\\"version\\\": \\\"v1.1\\\" added in config).\\n\\n\\n\\n### Steps to Reproduce\\n\\n1. Create any crew which uses external memory with mem0 provider as shown above.\\n2. Run the crew.\\n\\n### Expected behavior\\n\\nThe local mem0 search functionality should work as it does with the cloud one. \\nI am using qdrant for my vector store.\\n\\n### Screenshots/Code snippets\\n\\nNone\\n\\n### Operating System\\n\\nmacOS Sonoma\\n\\n### Python Version\\n\\n3.11\\n\\n### crewAI Version\\n\\n0.114.0\\n\\n### crewAI Tools Version\\n\\n0.40.1\\n\\n### Virtual Environment\\n\\nVenv\\n\\n### Evidence\\n\\nTraceback (most recent call last):\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\\\", line 27, in run_crew\\n result = crew.kickoff(inputs=inputs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\\\", line 646, in kickoff\\n result = self._run_sequential_process()\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\\\", line 758, in _run_sequential_process\\n return self._execute_tasks(self.tasks)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/crew.py\\\", line 861, in _execute_tasks\\n task_output = task.execute_sync(\\n ^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 61, in wrapper\\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 149, in wrap_task_execute\\n result = wrapped(*args, **kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\\\", line 328, in execute_sync\\n return self._execute_core(agent, context, tools)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\\\", line 472, in _execute_core\\n raise e # Re-raise the exception after emitting the event\\n ^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/task.py\\\", line 392, in _execute_core\\n result = agent.execute_task(\\n ^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 61, in wrapper\\n return func(tracer, duration_histogram, token_histogram, wrapped, instance, args, kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/.venv/lib/python3.11/site-packages/opentelemetry/instrumentation/crewai/instrumentation.py\\\", line 108, in wrap_agent_execute_task\\n result = wrapped(*args, **kwargs)\\n ^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/agent.py\\\", line 212, in execute_task\\n memory = contextual_memory.build_context_for_task(task, context)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\\\", line 46, in build_context_for_task\\n context.append(self._fetch_external_context(query))\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/contextual/contextual_memory.py\\\", line 130, in _fetch_external_context\\n external_memories = self.exm.search(query)\\n ^^^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/memory.py\\\", line 37, in search\\n return self.storage.search(\\n ^^^^^^^^^^^^^^^^^^^^\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/src/crewai/memory/storage/mem0_storage.py\\\", line 119, in search\\n results = self.memory.search(**params)\\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\\nTypeError: Memory.search() got an unexpected keyword argument 'metadata'\\n\\nDuring handling of the above exception, another exception occurred:\\n\\nTraceback (most recent call last):\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\\\", line 40, in <module>\\n run_crew()\\n File \\\"/Users/JainishSavalia/work/playground/crewAI/examples/main.py\\\", line 34, in run_crew\\n print(f\\\"\\\\nAn error occurred: {e.with_traceback()}\\\")\\n\\n### Possible Solution\\n\\nNone\\n\\n### Additional context\\n\\nNone\",\n \"number\": 2599,\n \"title\": \"[BUG] Mem0 (local config) - Memory.search() got an unexpected keyword argument 'metadata'\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"566935fb945477f301ad090cfb00b1e47cbf211e"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"d079e3652a662b855ae94541345ce60bea22d5ff\",\n \"head_commit_message\": \"fix lint and tests\",\n \"patch_to_review\": \"diff --git a/pyproject.toml b/pyproject.toml\\nindex d85c43c932..fc393f003c 100644\\n--- a/pyproject.toml\\n+++ b/pyproject.toml\\n@@ -60,7 +60,7 @@ pandas = [\\n openpyxl = [\\n \\\"openpyxl>=3.1.5\\\",\\n ]\\n-mem0 = [\\\"mem0ai>=0.1.29\\\"]\\n+mem0 = [\\\"mem0ai>=0.1.90\\\"]\\n docling = [\\n \\\"docling>=2.12.0\\\",\\n ]\\ndiff --git a/src/crewai/memory/storage/mem0_storage.py b/src/crewai/memory/storage/mem0_storage.py\\nindex 8357887272..114bd052fd 100644\\n--- a/src/crewai/memory/storage/mem0_storage.py\\n+++ b/src/crewai/memory/storage/mem0_storage.py\\n@@ -88,7 +88,9 @@ def save(self, value: Any, metadata: Dict[str, Any]) -> None:\\n }\\n \\n if params:\\n- self.memory.add(value, **params | {\\\"output_format\\\": \\\"v1.1\\\"})\\n+ if not hasattr(self, \\\"llm\\\"):\\n+ params[\\\"output_format\\\"] = \\\"v1.1\\\"\\n+ self.memory.add(value, **params)\\n \\n def search(\\n self,\\n@@ -96,7 +98,7 @@ def search(\\n limit: int = 3,\\n score_threshold: float = 0.35,\\n ) -> List[Any]:\\n- params = {\\\"query\\\": query, \\\"limit\\\": limit}\\n+ params = {\\\"query\\\": query, \\\"limit\\\": limit, \\\"output_format\\\": \\\"v1.1\\\"}\\n if user_id := self._get_user_id():\\n params[\\\"user_id\\\"] = user_id\\n \\n@@ -116,8 +118,10 @@ def search(\\n \\n # Discard the filters for now since we create the filters\\n # automatically when the crew is created.\\n+ if hasattr(self, \\\"llm\\\"):\\n+ del params[\\\"metadata\\\"], params[\\\"output_format\\\"]\\n results = self.memory.search(**params)\\n- return [r for r in results if r[\\\"score\\\"] >= score_threshold]\\n+ return [r for r in results[\\\"results\\\"] if r[\\\"score\\\"] >= score_threshold]\\n \\n def _get_user_id(self) -> str:\\n return self._get_config().get(\\\"user_id\\\", \\\"\\\")\\ndiff --git a/tests/memory/user_memory_test.py b/tests/memory/user_memory_test.py\\nindex 53514f6382..da974c3e31 100644\\n--- a/tests/memory/user_memory_test.py\\n+++ b/tests/memory/user_memory_test.py\\n@@ -1,4 +1,3 @@\\n-\\n from unittest.mock import MagicMock, patch\\n \\n import pytest\\n@@ -65,4 +64,26 @@ def test_save_and_search(user_memory):\\n with patch.object(UserMemory, 'search', return_value=expected_result) as mock_search:\\n find = UserMemory.search(\\\"test value\\\", score_threshold=0.01)[0]\\n mock_search.assert_called_once_with(\\\"test value\\\", score_threshold=0.01)\\n- assert find == expected_result[0]\\n\\\\ No newline at end of file\\n+ assert find == expected_result[0]\\n+\\n+def test_search_with_llm(user_memory):\\n+ \\\"\\\"\\\"Test search behavior when llm attribute exists in storage.\\\"\\\"\\\"\\n+ storage_mock = MagicMock()\\n+ setattr(storage_mock, \\\"llm\\\", True)\\n+\\n+ mock_search_results = {\\\"results\\\": [{\\\"context\\\": \\\"test context\\\", \\\"score\\\": 0.9}]}\\n+ storage_mock.search.return_value = mock_search_results\\n+ user_memory.storage = storage_mock\\n+\\n+ results = user_memory.search(\\\"test query\\\")\\n+ \\n+ storage_mock.search.assert_called_once()\\n+ call_args = storage_mock.search.call_args[1]\\n+ assert \\\"query\\\" in call_args\\n+ assert \\\"limit\\\" in call_args\\n+ assert \\\"score_threshold\\\" in call_args\\n+\\n+ assert \\\"metadata\\\" not in call_args\\n+ assert \\\"output_format\\\" not in call_args\\n+\\n+ assert results == {\\\"results\\\": [{\\\"context\\\": \\\"test context\\\", \\\"score\\\": 0.9}]}\\n\\\\ No newline at end of file\\ndiff --git a/uv.lock b/uv.lock\\nindex 21c8445f05..eb125e916e 100644\\n--- a/uv.lock\\n+++ b/uv.lock\\n@@ -726,7 +726,7 @@ requires-dist = [\\n { name = \\\"json5\\\", specifier = \\\">=0.10.0\\\" },\\n { name = \\\"jsonref\\\", specifier = \\\">=1.1.0\\\" },\\n { name = \\\"litellm\\\", specifier = \\\"==1.60.2\\\" },\\n- { name = \\\"mem0ai\\\", marker = \\\"extra == 'mem0'\\\", specifier = \\\">=0.1.29\\\" },\\n+ { name = \\\"mem0ai\\\", marker = \\\"extra == 'mem0'\\\", specifier = \\\">=0.1.90\\\" },\\n { name = \\\"openai\\\", specifier = \\\">=1.13.3\\\" },\\n { name = \\\"openpyxl\\\", specifier = \\\">=3.1.5\\\" },\\n { name = \\\"openpyxl\\\", marker = \\\"extra == 'openpyxl'\\\", specifier = \\\">=3.1.5\\\" },\\n@@ -2488,19 +2488,20 @@ wheels = [\\n \\n [[package]]\\n name = \\\"mem0ai\\\"\\n-version = \\\"0.1.29\\\"\\n+version = \\\"0.1.90\\\"\\n source = { registry = \\\"https://pypi.org/simple\\\" }\\n dependencies = [\\n { name = \\\"openai\\\" },\\n { name = \\\"posthog\\\" },\\n+ { name = \\\"psycopg2-binary\\\" },\\n { name = \\\"pydantic\\\" },\\n { name = \\\"pytz\\\" },\\n { name = \\\"qdrant-client\\\" },\\n { name = \\\"sqlalchemy\\\" },\\n ]\\n-sdist = { url = \\\"https://files.pythonhosted.org/packages/a9/bf/152718f9da3844dd24d4c45850b2e719798b5ce9389adf4ec873ee8905ca/mem0ai-0.1.29.tar.gz\\\", hash = \\\"sha256:42adefb7a9b241be03fbcabadf5328abf91b4ac390bc97e5966e55e3cac192c5\\\", size = 55201 }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/8f/47/4f49523dc5ae22c159a8931d6aad78df9e43119eb2f707adf1368e08ae30/mem0ai-0.1.90.tar.gz\\\", hash = \\\"sha256:b3c76213f03badc2d567ab44c6b1d498fa88c81b8bf1e747f73e1430fbc199fe\\\", size = 87656 }\\n wheels = [\\n- { url = \\\"https://files.pythonhosted.org/packages/65/9b/755be84f669415b3b513cfd935e768c4c84ac5c1ab6ff6ac2dab990a261a/mem0ai-0.1.29-py3-none-any.whl\\\", hash = \\\"sha256:07bbfd4238d0d7da65d5e4cf75a217eeb5b2829834e399074b05bb046730a57f\\\", size = 79558 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0a/f1/5d4462784be0cad0f9bce727cac8a907a9c008a399567b19bb77b1ff99c7/mem0ai-0.1.90-py3-none-any.whl\\\", hash = \\\"sha256:dae0acb32fa1f860a0e7990028c8ca759c440cfa739476cae302878143b13301\\\", size = 135956 },\\n ]\\n \\n [[package]]\\n@@ -3673,6 +3674,50 @@ wheels = [\\n { url = \\\"https://files.pythonhosted.org/packages/05/33/2d74d588408caedd065c2497bdb5ef83ce6082db01289a1e1147f6639802/psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl\\\", hash = \\\"sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8\\\", size = 249898 },\\n ]\\n \\n+[[package]]\\n+name = \\\"psycopg2-binary\\\"\\n+version = \\\"2.9.10\\\"\\n+source = { registry = \\\"https://pypi.org/simple\\\" }\\n+sdist = { url = \\\"https://files.pythonhosted.org/packages/cb/0e/bdc8274dc0585090b4e3432267d7be4dfbfd8971c0fa59167c711105a6bf/psycopg2-binary-2.9.10.tar.gz\\\", hash = \\\"sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2\\\", size = 385764 }\\n+wheels = [\\n+ { url = \\\"https://files.pythonhosted.org/packages/7a/81/331257dbf2801cdb82105306042f7a1637cc752f65f2bb688188e0de5f0b/psycopg2_binary-2.9.10-cp310-cp310-macosx_12_0_x86_64.whl\\\", hash = \\\"sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f\\\", size = 3043397 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e7/9a/7f4f2f031010bbfe6a02b4a15c01e12eb6b9b7b358ab33229f28baadbfc1/psycopg2_binary-2.9.10-cp310-cp310-macosx_14_0_arm64.whl\\\", hash = \\\"sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906\\\", size = 3274806 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e5/57/8ddd4b374fa811a0b0a0f49b6abad1cde9cb34df73ea3348cc283fcd70b4/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92\\\", size = 2851361 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/f9/66/d1e52c20d283f1f3a8e7e5c1e06851d432f123ef57b13043b4f9b21ffa1f/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007\\\", size = 3080836 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/a0/cb/592d44a9546aba78f8a1249021fe7c59d3afb8a0ba51434d6610cc3462b6/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0\\\", size = 3264552 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/64/33/c8548560b94b7617f203d7236d6cdf36fe1a5a3645600ada6efd79da946f/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4\\\", size = 3019789 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/b0/0e/c2da0db5bea88a3be52307f88b75eec72c4de62814cbe9ee600c29c06334/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1\\\", size = 2871776 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/15/d7/774afa1eadb787ddf41aab52d4c62785563e29949613c958955031408ae6/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5\\\", size = 2820959 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/5e/ed/440dc3f5991a8c6172a1cde44850ead0e483a375277a1aef7cfcec00af07/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_ppc64le.whl\\\", hash = \\\"sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5\\\", size = 2919329 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/03/be/2cc8f4282898306732d2ae7b7378ae14e8df3c1231b53579efa056aae887/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53\\\", size = 2957659 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d0/12/fb8e4f485d98c570e00dad5800e9a2349cfe0f71a767c856857160d343a5/psycopg2_binary-2.9.10-cp310-cp310-win32.whl\\\", hash = \\\"sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b\\\", size = 1024605 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/22/4f/217cd2471ecf45d82905dd09085e049af8de6cfdc008b6663c3226dc1c98/psycopg2_binary-2.9.10-cp310-cp310-win_amd64.whl\\\", hash = \\\"sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1\\\", size = 1163817 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/9c/8f/9feb01291d0d7a0a4c6a6bab24094135c2b59c6a81943752f632c75896d6/psycopg2_binary-2.9.10-cp311-cp311-macosx_12_0_x86_64.whl\\\", hash = \\\"sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff\\\", size = 3043397 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/15/30/346e4683532011561cd9c8dfeac6a8153dd96452fee0b12666058ab7893c/psycopg2_binary-2.9.10-cp311-cp311-macosx_14_0_arm64.whl\\\", hash = \\\"sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c\\\", size = 3274806 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/66/6e/4efebe76f76aee7ec99166b6c023ff8abdc4e183f7b70913d7c047701b79/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c\\\", size = 2851370 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/7f/fd/ff83313f86b50f7ca089b161b8e0a22bb3c319974096093cd50680433fdb/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb\\\", size = 3080780 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e6/c4/bfadd202dcda8333a7ccafdc51c541dbdfce7c2c7cda89fa2374455d795f/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341\\\", size = 3264583 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/5d/f1/09f45ac25e704ac954862581f9f9ae21303cc5ded3d0b775532b407f0e90/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a\\\", size = 3019831 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/9e/2e/9beaea078095cc558f215e38f647c7114987d9febfc25cb2beed7c3582a5/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b\\\", size = 2871822 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/01/9e/ef93c5d93f3dc9fc92786ffab39e323b9aed066ba59fdc34cf85e2722271/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7\\\", size = 2820975 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/a5/f0/049e9631e3268fe4c5a387f6fc27e267ebe199acf1bc1bc9cbde4bd6916c/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_ppc64le.whl\\\", hash = \\\"sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e\\\", size = 2919320 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/dc/9a/bcb8773b88e45fb5a5ea8339e2104d82c863a3b8558fbb2aadfe66df86b3/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68\\\", size = 2957617 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/e2/6b/144336a9bf08a67d217b3af3246abb1d027095dab726f0687f01f43e8c03/psycopg2_binary-2.9.10-cp311-cp311-win32.whl\\\", hash = \\\"sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392\\\", size = 1024618 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/61/69/3b3d7bd583c6d3cbe5100802efa5beacaacc86e37b653fc708bf3d6853b8/psycopg2_binary-2.9.10-cp311-cp311-win_amd64.whl\\\", hash = \\\"sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4\\\", size = 1163816 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/49/7d/465cc9795cf76f6d329efdafca74693714556ea3891813701ac1fee87545/psycopg2_binary-2.9.10-cp312-cp312-macosx_12_0_x86_64.whl\\\", hash = \\\"sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0\\\", size = 3044771 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/8b/31/6d225b7b641a1a2148e3ed65e1aa74fc86ba3fee850545e27be9e1de893d/psycopg2_binary-2.9.10-cp312-cp312-macosx_14_0_arm64.whl\\\", hash = \\\"sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a\\\", size = 3275336 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/30/b7/a68c2b4bff1cbb1728e3ec864b2d92327c77ad52edcd27922535a8366f68/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\\\", hash = \\\"sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539\\\", size = 2851637 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/0b/b1/cfedc0e0e6f9ad61f8657fd173b2f831ce261c02a08c0b09c652b127d813/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl\\\", hash = \\\"sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526\\\", size = 3082097 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/18/ed/0a8e4153c9b769f59c02fb5e7914f20f0b2483a19dae7bf2db54b743d0d0/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\\\", hash = \\\"sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1\\\", size = 3264776 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/10/db/d09da68c6a0cdab41566b74e0a6068a425f077169bed0946559b7348ebe9/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\\\", hash = \\\"sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e\\\", size = 3020968 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/94/28/4d6f8c255f0dfffb410db2b3f9ac5218d959a66c715c34cac31081e19b95/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_aarch64.whl\\\", hash = \\\"sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f\\\", size = 2872334 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/05/f7/20d7bf796593c4fea95e12119d6cc384ff1f6141a24fbb7df5a668d29d29/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_i686.whl\\\", hash = \\\"sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00\\\", size = 2822722 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/4d/e4/0c407ae919ef626dbdb32835a03b6737013c3cc7240169843965cada2bdf/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_ppc64le.whl\\\", hash = \\\"sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5\\\", size = 2920132 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/2d/70/aa69c9f69cf09a01da224909ff6ce8b68faeef476f00f7ec377e8f03be70/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_x86_64.whl\\\", hash = \\\"sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47\\\", size = 2959312 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/d3/bd/213e59854fafe87ba47814bf413ace0dcee33a89c8c8c814faca6bc7cf3c/psycopg2_binary-2.9.10-cp312-cp312-win32.whl\\\", hash = \\\"sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64\\\", size = 1025191 },\\n+ { url = \\\"https://files.pythonhosted.org/packages/92/29/06261ea000e2dc1e22907dbbc483a1093665509ea586b29b8986a0e56733/psycopg2_binary-2.9.10-cp312-cp312-win_amd64.whl\\\", hash = \\\"sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0\\\", size = 1164031 },\\n+]\\n+\\n [[package]]\\n name = \\\"ptyprocess\\\"\\n version = \\\"0.7.0\\\"\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -116,8 +118,10 @@ def search(\n \n # Discard the filters for now since we create the filters\n # automatically when the crew is created.\n+ if hasattr(self, \"llm\"):","line":null,"original_line":121,"original_start_line":null,"path":"src/crewai/memory/storage/mem0_storage.py","start_line":null,"text":"@user1:\nSomething feels off here… I think your test might be too addicted, because it really shouldn’t work like, ever!\r\nI believe you should be checking `hasattr(self.memory, \"llm\")` instead of `self`, since even self has a defined llm model.\r\nWhat bothers me most is that even when one test fails, it still goes unnoticed that’s kind of serious.\r\n\r\nIf I’m right about this, it’d be a good idea to revisit the tests\n\n@author:\nHey yes you are correct `hasattr(self, \"llm\")` was accessing the LLM from crewai and not from Mem0. And that;s why the tests also passed. But now I have made the fix for it."}],"string":"[\n {\n \"diff_hunk\": \"@@ -116,8 +118,10 @@ def search(\\n \\n # Discard the filters for now since we create the filters\\n # automatically when the crew is created.\\n+ if hasattr(self, \\\"llm\\\"):\",\n \"line\": null,\n \"original_line\": 121,\n \"original_start_line\": null,\n \"path\": \"src/crewai/memory/storage/mem0_storage.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nSomething feels off here… I think your test might be too addicted, because it really shouldn’t work like, ever!\\r\\nI believe you should be checking `hasattr(self.memory, \\\"llm\\\")` instead of `self`, since even self has a defined llm model.\\r\\nWhat bothers me most is that even when one test fails, it still goes unnoticed that’s kind of serious.\\r\\n\\r\\nIf I’m right about this, it’d be a good idea to revisit the tests\\n\\n@author:\\nHey yes you are correct `hasattr(self, \\\"llm\\\")` was accessing the LLM from crewai and not from Mem0. And that;s why the tests also passed. But now I have made the fix for it.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"69653aaab7c223b4faf0ffbd66182d2edc602a6f"},"merged_patch":{"kind":"string","value":"diff --git a/pyproject.toml b/pyproject.toml\nindex 7f5a5b007f..085a6e2425 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -60,7 +60,7 @@ pandas = [\n openpyxl = [\n \"openpyxl>=3.1.5\",\n ]\n-mem0 = [\"mem0ai>=0.1.29\"]\n+mem0 = [\"mem0ai>=0.1.94\"]\n docling = [\n \"docling>=2.12.0\",\n ]\ndiff --git a/src/crewai/memory/storage/mem0_storage.py b/src/crewai/memory/storage/mem0_storage.py\nindex 8357887272..5d601ac1fb 100644\n--- a/src/crewai/memory/storage/mem0_storage.py\n+++ b/src/crewai/memory/storage/mem0_storage.py\n@@ -88,7 +88,9 @@ def save(self, value: Any, metadata: Dict[str, Any]) -> None:\n }\n \n if params:\n- self.memory.add(value, **params | {\"output_format\": \"v1.1\"})\n+ if isinstance(self.memory, MemoryClient):\n+ params[\"output_format\"] = \"v1.1\"\n+ self.memory.add(value, **params)\n \n def search(\n self,\n@@ -96,7 +98,7 @@ def search(\n limit: int = 3,\n score_threshold: float = 0.35,\n ) -> List[Any]:\n- params = {\"query\": query, \"limit\": limit}\n+ params = {\"query\": query, \"limit\": limit, \"output_format\": \"v1.1\"}\n if user_id := self._get_user_id():\n params[\"user_id\"] = user_id\n \n@@ -116,8 +118,11 @@ def search(\n \n # Discard the filters for now since we create the filters\n # automatically when the crew is created.\n+ if isinstance(self.memory, Memory):\n+ del params[\"metadata\"], params[\"output_format\"]\n+ \n results = self.memory.search(**params)\n- return [r for r in results if r[\"score\"] >= score_threshold]\n+ return [r for r in results[\"results\"] if r[\"score\"] >= score_threshold]\n \n def _get_user_id(self) -> str:\n return self._get_config().get(\"user_id\", \"\")\ndiff --git a/tests/memory/user_memory_test.py b/tests/memory/user_memory_test.py\nindex 53514f6382..0b28cd4430 100644\n--- a/tests/memory/user_memory_test.py\n+++ b/tests/memory/user_memory_test.py\n@@ -1,4 +1,3 @@\n-\n from unittest.mock import MagicMock, patch\n \n import pytest\n@@ -65,4 +64,4 @@ def test_save_and_search(user_memory):\n with patch.object(UserMemory, 'search', return_value=expected_result) as mock_search:\n find = UserMemory.search(\"test value\", score_threshold=0.01)[0]\n mock_search.assert_called_once_with(\"test value\", score_threshold=0.01)\n- assert find == expected_result[0]\n\\ No newline at end of file\n+ assert find == expected_result[0]\ndiff --git a/tests/storage/test_mem0_storage.py b/tests/storage/test_mem0_storage.py\nindex f0c62d4800..b651521f92 100644\n--- a/tests/storage/test_mem0_storage.py\n+++ b/tests/storage/test_mem0_storage.py\n@@ -15,6 +15,7 @@\n class MockCrew:\n def __init__(self, memory_config):\n self.memory_config = memory_config\n+ self.agents = [MagicMock(role=\"Test Agent\")]\n \n \n @pytest.fixture\n@@ -107,11 +108,13 @@ def mem0_storage_with_memory_client_using_config_from_crew(mock_mem0_memory_clie\n \n \n @pytest.fixture\n-def mem0_storage_with_memory_client_using_explictly_config(mock_mem0_memory_client):\n+def mem0_storage_with_memory_client_using_explictly_config(mock_mem0_memory_client, mock_mem0_memory):\n \"\"\"Fixture to create a Mem0Storage instance with mocked dependencies\"\"\"\n \n- # We need to patch the MemoryClient before it's instantiated\n- with patch.object(MemoryClient, \"__new__\", return_value=mock_mem0_memory_client):\n+ # We need to patch both MemoryClient and Memory to prevent actual initialization\n+ with patch.object(MemoryClient, \"__new__\", return_value=mock_mem0_memory_client), \\\n+ patch.object(Memory, \"__new__\", return_value=mock_mem0_memory):\n+\n crew = MockCrew(\n memory_config={\n \"provider\": \"mem0\",\n@@ -155,3 +158,82 @@ def test_mem0_storage_with_explict_config(\n mem0_storage_with_memory_client_using_explictly_config.memory_config\n == expected_config\n )\n+\n+\n+def test_save_method_with_memory_oss(mem0_storage_with_mocked_config):\n+ \"\"\"Test save method for different memory types\"\"\"\n+ mem0_storage, _, _ = mem0_storage_with_mocked_config\n+ mem0_storage.memory.add = MagicMock()\n+ \n+ # Test short_term memory type (already set in fixture)\n+ test_value = \"This is a test memory\"\n+ test_metadata = {\"key\": \"value\"}\n+ \n+ mem0_storage.save(test_value, test_metadata)\n+ \n+ mem0_storage.memory.add.assert_called_once_with(\n+ test_value,\n+ agent_id=\"Test_Agent\",\n+ infer=False,\n+ metadata={\"type\": \"short_term\", \"key\": \"value\"},\n+ )\n+\n+\n+def test_save_method_with_memory_client(mem0_storage_with_memory_client_using_config_from_crew):\n+ \"\"\"Test save method for different memory types\"\"\"\n+ mem0_storage = mem0_storage_with_memory_client_using_config_from_crew\n+ mem0_storage.memory.add = MagicMock()\n+ \n+ # Test short_term memory type (already set in fixture)\n+ test_value = \"This is a test memory\"\n+ test_metadata = {\"key\": \"value\"}\n+ \n+ mem0_storage.save(test_value, test_metadata)\n+ \n+ mem0_storage.memory.add.assert_called_once_with(\n+ test_value,\n+ agent_id=\"Test_Agent\",\n+ infer=False,\n+ metadata={\"type\": \"short_term\", \"key\": \"value\"},\n+ output_format=\"v1.1\"\n+ )\n+\n+\n+def test_search_method_with_memory_oss(mem0_storage_with_mocked_config):\n+ \"\"\"Test search method for different memory types\"\"\"\n+ mem0_storage, _, _ = mem0_storage_with_mocked_config\n+ mock_results = {\"results\": [{\"score\": 0.9, \"content\": \"Result 1\"}, {\"score\": 0.4, \"content\": \"Result 2\"}]}\n+ mem0_storage.memory.search = MagicMock(return_value=mock_results)\n+\n+ results = mem0_storage.search(\"test query\", limit=5, score_threshold=0.5)\n+\n+ mem0_storage.memory.search.assert_called_once_with(\n+ query=\"test query\", \n+ limit=5, \n+ agent_id=\"Test_Agent\",\n+ user_id=\"test_user\"\n+ )\n+\n+ assert len(results) == 1\n+ assert results[0][\"content\"] == \"Result 1\"\n+\n+\n+def test_search_method_with_memory_client(mem0_storage_with_memory_client_using_config_from_crew):\n+ \"\"\"Test search method for different memory types\"\"\"\n+ mem0_storage = mem0_storage_with_memory_client_using_config_from_crew\n+ mock_results = {\"results\": [{\"score\": 0.9, \"content\": \"Result 1\"}, {\"score\": 0.4, \"content\": \"Result 2\"}]}\n+ mem0_storage.memory.search = MagicMock(return_value=mock_results)\n+\n+ results = mem0_storage.search(\"test query\", limit=5, score_threshold=0.5)\n+\n+ mem0_storage.memory.search.assert_called_once_with(\n+ query=\"test query\", \n+ limit=5, \n+ agent_id=\"Test_Agent\", \n+ metadata={\"type\": \"short_term\"},\n+ user_id=\"test_user\",\n+ output_format='v1.1'\n+ )\n+\n+ assert len(results) == 1\n+ assert results[0][\"content\"] == \"Result 1\"\ndiff --git a/uv.lock b/uv.lock\nindex e78a581824..c47eee5162 100644\n--- a/uv.lock\n+++ b/uv.lock\n@@ -73,6 +73,78 @@ resolution-markers = [\n \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version < '3.11' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version < '3.11' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version < '3.11' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version < '3.11' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version < '3.11' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version < '3.11' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"(python_full_version < '3.11' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version < '3.11' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version < '3.11' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version < '3.11' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"(python_full_version < '3.11' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version < '3.11' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version < '3.11' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version < '3.11' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version < '3.11' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version == '3.11.*' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version == '3.11.*' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version == '3.11.*' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version == '3.11.*' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version == '3.11.*' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version == '3.11.*' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"(python_full_version == '3.11.*' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version == '3.11.*' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version == '3.11.*' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version == '3.11.*' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"(python_full_version == '3.11.*' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version == '3.11.*' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version == '3.11.*' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version == '3.11.*' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version == '3.11.*' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"(python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"(python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12' and python_full_version < '3.12.4' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version >= '3.12.4' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'darwin'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'darwin'\",\n+ \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform == 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'darwin')\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform == 'linux'\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform == 'linux'\",\n+ \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation == 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation == 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation == 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and platform_system == 'Darwin' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n+ \"python_full_version >= '3.12.4' and platform_machine == 'aarch64' and platform_python_implementation != 'PyPy' and platform_system == 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux'\",\n+ \"(python_full_version >= '3.12.4' and platform_machine != 'aarch64' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and sys_platform != 'darwin') or (python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and platform_system != 'Darwin' and platform_system != 'Linux' and sys_platform != 'darwin' and sys_platform != 'linux')\",\n ]\n \n [[package]]\n@@ -762,7 +834,7 @@ requires-dist = [\n { name = \"json5\", specifier = \">=0.10.0\" },\n { name = \"jsonref\", specifier = \">=1.1.0\" },\n { name = \"litellm\", specifier = \"==1.67.2\" },\n- { name = \"mem0ai\", marker = \"extra == 'mem0'\", specifier = \">=0.1.29\" },\n+ { name = \"mem0ai\", marker = \"extra == 'mem0'\", specifier = \">=0.1.94\" },\n { name = \"openai\", specifier = \">=1.13.3\" },\n { name = \"openpyxl\", specifier = \">=3.1.5\" },\n { name = \"openpyxl\", marker = \"extra == 'openpyxl'\", specifier = \">=3.1.5\" },\n@@ -2326,9 +2398,9 @@ dependencies = [\n { name = \"tiktoken\" },\n { name = \"tokenizers\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/a7/61/b974067af7908f19a0391ebda0ebfdff376eb9314c28578a9e60b0b381a7/litellm-1.67.2.tar.gz\", hash = \"sha256:9e108827bff16af04fd4c35b0c1a1d6c7746c96db3870189a60141d449797487\", size = 7257152, upload_time = \"2025-04-24T05:09:40.762Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/a7/61/b974067af7908f19a0391ebda0ebfdff376eb9314c28578a9e60b0b381a7/litellm-1.67.2.tar.gz\", hash = \"sha256:9e108827bff16af04fd4c35b0c1a1d6c7746c96db3870189a60141d449797487\", size = 7257152 }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/c2/7f/1a7750bf49ff096ec8d924059a1daea7d98dc065a13294a849178a678c02/litellm-1.67.2-py3-none-any.whl\", hash = \"sha256:32df4d17b3ead17d04793311858965e41e83a7bdf9bd661895c0e6bc9c78dc8b\", size = 7626920, upload_time = \"2025-04-24T05:09:37.5Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/c2/7f/1a7750bf49ff096ec8d924059a1daea7d98dc065a13294a849178a678c02/litellm-1.67.2-py3-none-any.whl\", hash = \"sha256:32df4d17b3ead17d04793311858965e41e83a7bdf9bd661895c0e6bc9c78dc8b\", size = 7626920 },\n ]\n \n [[package]]\n@@ -2524,19 +2596,20 @@ wheels = [\n \n [[package]]\n name = \"mem0ai\"\n-version = \"0.1.29\"\n+version = \"0.1.94\"\n source = { registry = \"https://pypi.org/simple\" }\n dependencies = [\n { name = \"openai\" },\n { name = \"posthog\" },\n+ { name = \"psycopg2-binary\" },\n { name = \"pydantic\" },\n { name = \"pytz\" },\n { name = \"qdrant-client\" },\n { name = \"sqlalchemy\" },\n ]\n-sdist = { url = \"https://files.pythonhosted.org/packages/a9/bf/152718f9da3844dd24d4c45850b2e719798b5ce9389adf4ec873ee8905ca/mem0ai-0.1.29.tar.gz\", hash = \"sha256:42adefb7a9b241be03fbcabadf5328abf91b4ac390bc97e5966e55e3cac192c5\", size = 55201, upload_time = \"2024-11-07T06:07:20.661Z\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/f0/c2/f3a61d1f993bca5ecfca6e0d51b94963dc4807ca1929ea3a2a58c7298593/mem0ai-0.1.94.tar.gz\", hash = \"sha256:9f6754017fc6452aabf66961f759973c87ce0d78d77130448a537f9e38d2d767\", size = 93161 }\n wheels = [\n- { url = \"https://files.pythonhosted.org/packages/65/9b/755be84f669415b3b513cfd935e768c4c84ac5c1ab6ff6ac2dab990a261a/mem0ai-0.1.29-py3-none-any.whl\", hash = \"sha256:07bbfd4238d0d7da65d5e4cf75a217eeb5b2829834e399074b05bb046730a57f\", size = 79558, upload_time = \"2024-11-07T06:07:18.665Z\" },\n+ { url = \"https://files.pythonhosted.org/packages/0c/fa/a2043c5a228077423678d9e7e0fe3aab89ab9a625a4f171a30967de1bbb3/mem0ai-0.1.94-py3-none-any.whl\", hash = \"sha256:862aaccf4ec41d65a5c935dc49c7b8175c96f6b60b29abeda338d8a335027e2c\", size = 143077 },\n ]\n \n [[package]]\n@@ -3709,6 +3782,50 @@ wheels = [\n { url = \"https://files.pythonhosted.org/packages/05/33/2d74d588408caedd065c2497bdb5ef83ce6082db01289a1e1147f6639802/psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl\", hash = \"sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8\", size = 249898, upload_time = \"2024-01-19T20:47:59.238Z\" },\n ]\n \n+[[package]]\n+name = \"psycopg2-binary\"\n+version = \"2.9.10\"\n+source = { registry = \"https://pypi.org/simple\" }\n+sdist = { url = \"https://files.pythonhosted.org/packages/cb/0e/bdc8274dc0585090b4e3432267d7be4dfbfd8971c0fa59167c711105a6bf/psycopg2-binary-2.9.10.tar.gz\", hash = \"sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2\", size = 385764 }\n+wheels = [\n+ { url = \"https://files.pythonhosted.org/packages/7a/81/331257dbf2801cdb82105306042f7a1637cc752f65f2bb688188e0de5f0b/psycopg2_binary-2.9.10-cp310-cp310-macosx_12_0_x86_64.whl\", hash = \"sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f\", size = 3043397 },\n+ { url = \"https://files.pythonhosted.org/packages/e7/9a/7f4f2f031010bbfe6a02b4a15c01e12eb6b9b7b358ab33229f28baadbfc1/psycopg2_binary-2.9.10-cp310-cp310-macosx_14_0_arm64.whl\", hash = \"sha256:3e9c76f0ac6f92ecfc79516a8034a544926430f7b080ec5a0537bca389ee0906\", size = 3274806 },\n+ { url = \"https://files.pythonhosted.org/packages/e5/57/8ddd4b374fa811a0b0a0f49b6abad1cde9cb34df73ea3348cc283fcd70b4/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:2ad26b467a405c798aaa1458ba09d7e2b6e5f96b1ce0ac15d82fd9f95dc38a92\", size = 2851361 },\n+ { url = \"https://files.pythonhosted.org/packages/f9/66/d1e52c20d283f1f3a8e7e5c1e06851d432f123ef57b13043b4f9b21ffa1f/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:270934a475a0e4b6925b5f804e3809dd5f90f8613621d062848dd82f9cd62007\", size = 3080836 },\n+ { url = \"https://files.pythonhosted.org/packages/a0/cb/592d44a9546aba78f8a1249021fe7c59d3afb8a0ba51434d6610cc3462b6/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:48b338f08d93e7be4ab2b5f1dbe69dc5e9ef07170fe1f86514422076d9c010d0\", size = 3264552 },\n+ { url = \"https://files.pythonhosted.org/packages/64/33/c8548560b94b7617f203d7236d6cdf36fe1a5a3645600ada6efd79da946f/psycopg2_binary-2.9.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:7f4152f8f76d2023aac16285576a9ecd2b11a9895373a1f10fd9db54b3ff06b4\", size = 3019789 },\n+ { url = \"https://files.pythonhosted.org/packages/b0/0e/c2da0db5bea88a3be52307f88b75eec72c4de62814cbe9ee600c29c06334/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_aarch64.whl\", hash = \"sha256:32581b3020c72d7a421009ee1c6bf4a131ef5f0a968fab2e2de0c9d2bb4577f1\", size = 2871776 },\n+ { url = \"https://files.pythonhosted.org/packages/15/d7/774afa1eadb787ddf41aab52d4c62785563e29949613c958955031408ae6/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_i686.whl\", hash = \"sha256:2ce3e21dc3437b1d960521eca599d57408a695a0d3c26797ea0f72e834c7ffe5\", size = 2820959 },\n+ { url = \"https://files.pythonhosted.org/packages/5e/ed/440dc3f5991a8c6172a1cde44850ead0e483a375277a1aef7cfcec00af07/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_ppc64le.whl\", hash = \"sha256:e984839e75e0b60cfe75e351db53d6db750b00de45644c5d1f7ee5d1f34a1ce5\", size = 2919329 },\n+ { url = \"https://files.pythonhosted.org/packages/03/be/2cc8f4282898306732d2ae7b7378ae14e8df3c1231b53579efa056aae887/psycopg2_binary-2.9.10-cp310-cp310-musllinux_1_2_x86_64.whl\", hash = \"sha256:3c4745a90b78e51d9ba06e2088a2fe0c693ae19cc8cb051ccda44e8df8a6eb53\", size = 2957659 },\n+ { url = \"https://files.pythonhosted.org/packages/d0/12/fb8e4f485d98c570e00dad5800e9a2349cfe0f71a767c856857160d343a5/psycopg2_binary-2.9.10-cp310-cp310-win32.whl\", hash = \"sha256:e5720a5d25e3b99cd0dc5c8a440570469ff82659bb09431c1439b92caf184d3b\", size = 1024605 },\n+ { url = \"https://files.pythonhosted.org/packages/22/4f/217cd2471ecf45d82905dd09085e049af8de6cfdc008b6663c3226dc1c98/psycopg2_binary-2.9.10-cp310-cp310-win_amd64.whl\", hash = \"sha256:3c18f74eb4386bf35e92ab2354a12c17e5eb4d9798e4c0ad3a00783eae7cd9f1\", size = 1163817 },\n+ { url = \"https://files.pythonhosted.org/packages/9c/8f/9feb01291d0d7a0a4c6a6bab24094135c2b59c6a81943752f632c75896d6/psycopg2_binary-2.9.10-cp311-cp311-macosx_12_0_x86_64.whl\", hash = \"sha256:04392983d0bb89a8717772a193cfaac58871321e3ec69514e1c4e0d4957b5aff\", size = 3043397 },\n+ { url = \"https://files.pythonhosted.org/packages/15/30/346e4683532011561cd9c8dfeac6a8153dd96452fee0b12666058ab7893c/psycopg2_binary-2.9.10-cp311-cp311-macosx_14_0_arm64.whl\", hash = \"sha256:1a6784f0ce3fec4edc64e985865c17778514325074adf5ad8f80636cd029ef7c\", size = 3274806 },\n+ { url = \"https://files.pythonhosted.org/packages/66/6e/4efebe76f76aee7ec99166b6c023ff8abdc4e183f7b70913d7c047701b79/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:b5f86c56eeb91dc3135b3fd8a95dc7ae14c538a2f3ad77a19645cf55bab1799c\", size = 2851370 },\n+ { url = \"https://files.pythonhosted.org/packages/7f/fd/ff83313f86b50f7ca089b161b8e0a22bb3c319974096093cd50680433fdb/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:2b3d2491d4d78b6b14f76881905c7a8a8abcf974aad4a8a0b065273a0ed7a2cb\", size = 3080780 },\n+ { url = \"https://files.pythonhosted.org/packages/e6/c4/bfadd202dcda8333a7ccafdc51c541dbdfce7c2c7cda89fa2374455d795f/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:2286791ececda3a723d1910441c793be44625d86d1a4e79942751197f4d30341\", size = 3264583 },\n+ { url = \"https://files.pythonhosted.org/packages/5d/f1/09f45ac25e704ac954862581f9f9ae21303cc5ded3d0b775532b407f0e90/psycopg2_binary-2.9.10-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:512d29bb12608891e349af6a0cccedce51677725a921c07dba6342beaf576f9a\", size = 3019831 },\n+ { url = \"https://files.pythonhosted.org/packages/9e/2e/9beaea078095cc558f215e38f647c7114987d9febfc25cb2beed7c3582a5/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_aarch64.whl\", hash = \"sha256:5a507320c58903967ef7384355a4da7ff3f28132d679aeb23572753cbf2ec10b\", size = 2871822 },\n+ { url = \"https://files.pythonhosted.org/packages/01/9e/ef93c5d93f3dc9fc92786ffab39e323b9aed066ba59fdc34cf85e2722271/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_i686.whl\", hash = \"sha256:6d4fa1079cab9018f4d0bd2db307beaa612b0d13ba73b5c6304b9fe2fb441ff7\", size = 2820975 },\n+ { url = \"https://files.pythonhosted.org/packages/a5/f0/049e9631e3268fe4c5a387f6fc27e267ebe199acf1bc1bc9cbde4bd6916c/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_ppc64le.whl\", hash = \"sha256:851485a42dbb0bdc1edcdabdb8557c09c9655dfa2ca0460ff210522e073e319e\", size = 2919320 },\n+ { url = \"https://files.pythonhosted.org/packages/dc/9a/bcb8773b88e45fb5a5ea8339e2104d82c863a3b8558fbb2aadfe66df86b3/psycopg2_binary-2.9.10-cp311-cp311-musllinux_1_2_x86_64.whl\", hash = \"sha256:35958ec9e46432d9076286dda67942ed6d968b9c3a6a2fd62b48939d1d78bf68\", size = 2957617 },\n+ { url = \"https://files.pythonhosted.org/packages/e2/6b/144336a9bf08a67d217b3af3246abb1d027095dab726f0687f01f43e8c03/psycopg2_binary-2.9.10-cp311-cp311-win32.whl\", hash = \"sha256:ecced182e935529727401b24d76634a357c71c9275b356efafd8a2a91ec07392\", size = 1024618 },\n+ { url = \"https://files.pythonhosted.org/packages/61/69/3b3d7bd583c6d3cbe5100802efa5beacaacc86e37b653fc708bf3d6853b8/psycopg2_binary-2.9.10-cp311-cp311-win_amd64.whl\", hash = \"sha256:ee0e8c683a7ff25d23b55b11161c2663d4b099770f6085ff0a20d4505778d6b4\", size = 1163816 },\n+ { url = \"https://files.pythonhosted.org/packages/49/7d/465cc9795cf76f6d329efdafca74693714556ea3891813701ac1fee87545/psycopg2_binary-2.9.10-cp312-cp312-macosx_12_0_x86_64.whl\", hash = \"sha256:880845dfe1f85d9d5f7c412efea7a08946a46894537e4e5d091732eb1d34d9a0\", size = 3044771 },\n+ { url = \"https://files.pythonhosted.org/packages/8b/31/6d225b7b641a1a2148e3ed65e1aa74fc86ba3fee850545e27be9e1de893d/psycopg2_binary-2.9.10-cp312-cp312-macosx_14_0_arm64.whl\", hash = \"sha256:9440fa522a79356aaa482aa4ba500b65f28e5d0e63b801abf6aa152a29bd842a\", size = 3275336 },\n+ { url = \"https://files.pythonhosted.org/packages/30/b7/a68c2b4bff1cbb1728e3ec864b2d92327c77ad52edcd27922535a8366f68/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:e3923c1d9870c49a2d44f795df0c889a22380d36ef92440ff618ec315757e539\", size = 2851637 },\n+ { url = \"https://files.pythonhosted.org/packages/0b/b1/cfedc0e0e6f9ad61f8657fd173b2f831ce261c02a08c0b09c652b127d813/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl\", hash = \"sha256:7b2c956c028ea5de47ff3a8d6b3cc3330ab45cf0b7c3da35a2d6ff8420896526\", size = 3082097 },\n+ { url = \"https://files.pythonhosted.org/packages/18/ed/0a8e4153c9b769f59c02fb5e7914f20f0b2483a19dae7bf2db54b743d0d0/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\", hash = \"sha256:f758ed67cab30b9a8d2833609513ce4d3bd027641673d4ebc9c067e4d208eec1\", size = 3264776 },\n+ { url = \"https://files.pythonhosted.org/packages/10/db/d09da68c6a0cdab41566b74e0a6068a425f077169bed0946559b7348ebe9/psycopg2_binary-2.9.10-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\", hash = \"sha256:8cd9b4f2cfab88ed4a9106192de509464b75a906462fb846b936eabe45c2063e\", size = 3020968 },\n+ { url = \"https://files.pythonhosted.org/packages/94/28/4d6f8c255f0dfffb410db2b3f9ac5218d959a66c715c34cac31081e19b95/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_aarch64.whl\", hash = \"sha256:6dc08420625b5a20b53551c50deae6e231e6371194fa0651dbe0fb206452ae1f\", size = 2872334 },\n+ { url = \"https://files.pythonhosted.org/packages/05/f7/20d7bf796593c4fea95e12119d6cc384ff1f6141a24fbb7df5a668d29d29/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_i686.whl\", hash = \"sha256:d7cd730dfa7c36dbe8724426bf5612798734bff2d3c3857f36f2733f5bfc7c00\", size = 2822722 },\n+ { url = \"https://files.pythonhosted.org/packages/4d/e4/0c407ae919ef626dbdb32835a03b6737013c3cc7240169843965cada2bdf/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_ppc64le.whl\", hash = \"sha256:155e69561d54d02b3c3209545fb08938e27889ff5a10c19de8d23eb5a41be8a5\", size = 2920132 },\n+ { url = \"https://files.pythonhosted.org/packages/2d/70/aa69c9f69cf09a01da224909ff6ce8b68faeef476f00f7ec377e8f03be70/psycopg2_binary-2.9.10-cp312-cp312-musllinux_1_2_x86_64.whl\", hash = \"sha256:c3cc28a6fd5a4a26224007712e79b81dbaee2ffb90ff406256158ec4d7b52b47\", size = 2959312 },\n+ { url = \"https://files.pythonhosted.org/packages/d3/bd/213e59854fafe87ba47814bf413ace0dcee33a89c8c8c814faca6bc7cf3c/psycopg2_binary-2.9.10-cp312-cp312-win32.whl\", hash = \"sha256:ec8a77f521a17506a24a5f626cb2aee7850f9b69a0afe704586f63a464f3cd64\", size = 1025191 },\n+ { url = \"https://files.pythonhosted.org/packages/92/29/06261ea000e2dc1e22907dbbc483a1093665509ea586b29b8986a0e56733/psycopg2_binary-2.9.10-cp312-cp312-win_amd64.whl\", hash = \"sha256:18c5ee682b9c6dd3696dad6e54cc7ff3a1a9020df6a5c0f861ef8bfd338c3ca0\", size = 1164031 },\n+]\n+\n [[package]]\n name = \"ptyprocess\"\n version = \"0.7.0\"\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2388,"cells":{"instance_id":{"kind":"string","value":"dask__dask-7455@e4ec2f2"},"repo":{"kind":"string","value":"dask/dask"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":7455,"string":"7,455"},"title":{"kind":"string","value":"Handle Blockwise HLG pack/unpack for concatenate=True"},"body":{"kind":"string","value":"One possible solution to the `Blockwise` serialization challenge discussed in [this comment](https://github.com/dask/dask/issues/7449#issuecomment-805073471). Note that I would certainly prefer a general solution to nested-task serialization.\r\n\r\n- [x] Closes #7449\r\n- [x] Tests added / passed\r\n- [x] Passes `black dask` / `flake8 dask`\r\n"},"created_at":{"kind":"string","value":"2021-03-23T19:01:45Z"},"problem_statement":{"kind":"string","value":"Blockwise with `concatenate=True` broken with LocalCluster + `optimize_graph=False` \n**What happened**:\r\nWhen using a LocalCluster (and probably the distributed scheduler in general), setting `optimize_graph=False` causes strange (and incorrect) behaviour in Blockwise with `concatentate=True`. \r\n\r\n**What you expected to happen**:\r\nBlockwise with `concatenate=True` should function as normal.\r\n\r\n**Minimal Complete Verifiable Example**:\r\n\r\n```python\r\nimport dask.array as da\r\nfrom distributed import LocalCluster, Client\r\n\r\n\r\ndef f(x, y):\r\n\r\n print(y)\r\n\r\n return x\r\n\r\n\r\nif __name__ == '__main__':\r\n\r\n cluster = LocalCluster(processes=False,\r\n n_workers=1,\r\n threads_per_worker=1)\r\n\r\n client = Client(cluster)\r\n\r\n x = da.array([0])\r\n y = da.array([[0]])\r\n\r\n z = da.blockwise(\r\n f, (\"i\"),\r\n x, (\"i\"),\r\n y, (\"ij\"),\r\n dtype=x.dtype,\r\n concatenate=True)\r\n\r\n da.compute(z, optimize_graph=False)\r\n```\r\n\r\n**Anything else we need to know?**:\r\nThe example above will print something like:\r\n```\r\n(<function concatenate_axes at 0x7f153d45c310>, [array([[0]])], [1])\r\n```\r\nThis is not what is expected - we expect an array. Note that the above example will work as normal when:\r\n- `optimize_graph=True`\r\n- A different scheduler is used.\r\n\r\nApologies if this should have been posted on `distributed` instead.\r\n\r\n**Environment**:\r\n\r\n- Dask version: 2021.3.0\r\n- Distributed version: 2021.3.0\r\n- Python version: 3.8.8\r\n- Operating System: Pop!_OS 18.04 LTS\r\n- Install method (conda, pip, source): pip"},"hints_text":{"kind":"string","value":"cc @rjzamora\n\nOn Tue, Mar 23, 2021 at 3:29 AM JSKenyon ***@***.***> wrote:\n\n> *What happened*:\n> When using a LocalCluster (and probably the distributed scheduler in\n> general), setting optimize_graph=False causes strange (and incorrect)\n> behaviour in Blockwise with concatentate=True.\n>\n> *What you expected to happen*:\n> Blockwise with concatenate=True should function as normal.\n>\n> *Minimal Complete Verifiable Example*:\n>\n> import dask.array as dafrom distributed import LocalCluster, Client\n>\n> def f(x, y):\n>\n> print(y)\n>\n> return x\n>\n> if __name__ == '__main__':\n>\n> cluster = LocalCluster(processes=False,\n> n_workers=1,\n> threads_per_worker=1)\n>\n> client = Client(cluster)\n>\n> x = da.array([0])\n> y = da.array([[0]])\n>\n> z = da.blockwise(\n> f, (\"i\"),\n> x, (\"i\"),\n> y, (\"ij\"),\n> dtype=x.dtype,\n> concatenate=True)\n>\n> da.compute(z, optimize_graph=False)\n>\n> *Anything else we need to know?*:\n> The example above will print something like:\n>\n> (<function concatenate_axes at 0x7f153d45c310>, [array([[0]])], [1])\n>\n> This is not what is expected - we expect an array. Note that the above\n> example will work as normal when:\n>\n> - optimize_graph=True\n> - A different scheduler is used.\n>\n> Apologies if this should have been posted on distributed instead.\n>\n> *Environment*:\n>\n> - Dask version: 2021.3.0\n> - Distributed version: 2021.3.0\n> - Python version: 3.8.8\n> - Operating System: Pop!_OS 18.04 LTS\n> - Install method (conda, pip, source): pip\n>\n> —\n> You are receiving this because you are subscribed to this thread.\n> Reply to this email directly, view it on GitHub\n> <https://github.com/dask/dask/issues/7449>, or unsubscribe\n> <https://github.com/notifications/unsubscribe-auth/AACKZTASJWAVN5RLPBYNBWLTFBGPZANCNFSM4ZUWHDNQ>\n> .\n>\n\nThanks for raising @JSKenyon - I'll check it out\nHmm - This issues is exposing a general HLG/Blockwise challenge related to complex/nested (i.e. inlined) task serialization...\r\n\r\nSince the primary callable object is already serialized by the time it reaches the scheduler, in `make_blockwise_graph`, we are replacing the usual `dumps_task` call with [an explicit `{\"function\": , \"args\": }` dictionary](https://github.com/dask/dask/blob/f6e9e81903bd2416125a97cc3856c63bb792bddf/dask/blockwise.py#L927). In cases without task inlining, this is fine, because it is exactly what [dumps_task](https://github.com/dask/distributed/blob/98148cbfee818889f683c4be0e591d33a59ffdf8/distributed/worker.py#L3515) would do anyway. When there **is** a \"complex\" task, however, `dumps_task` uses `to_serialize` instead (and the Blockwise behavior is just wrong).\r\n\r\n@jrbourbeau @jakirkham - I'll look into this, but do you have any high-level intuition? Might it be possible to use `to_serialize` in this case, even if the primary function is already serialized?"},"resolved_issues":{"kind":"list like","value":[{"body":"**What happened**:\r\nWhen using a LocalCluster (and probably the distributed scheduler in general), setting `optimize_graph=False` causes strange (and incorrect) behaviour in Blockwise with `concatentate=True`. \r\n\r\n**What you expected to happen**:\r\nBlockwise with `concatenate=True` should function as normal.\r\n\r\n**Minimal Complete Verifiable Example**:\r\n\r\n```python\r\nimport dask.array as da\r\nfrom distributed import LocalCluster, Client\r\n\r\n\r\ndef f(x, y):\r\n\r\n print(y)\r\n\r\n return x\r\n\r\n\r\nif __name__ == '__main__':\r\n\r\n cluster = LocalCluster(processes=False,\r\n n_workers=1,\r\n threads_per_worker=1)\r\n\r\n client = Client(cluster)\r\n\r\n x = da.array([0])\r\n y = da.array([[0]])\r\n\r\n z = da.blockwise(\r\n f, (\"i\"),\r\n x, (\"i\"),\r\n y, (\"ij\"),\r\n dtype=x.dtype,\r\n concatenate=True)\r\n\r\n da.compute(z, optimize_graph=False)\r\n```\r\n\r\n**Anything else we need to know?**:\r\nThe example above will print something like:\r\n```\r\n(<function concatenate_axes at 0x7f153d45c310>, [array([[0]])], [1])\r\n```\r\nThis is not what is expected - we expect an array. Note that the above example will work as normal when:\r\n- `optimize_graph=True`\r\n- A different scheduler is used.\r\n\r\nApologies if this should have been posted on `distributed` instead.\r\n\r\n**Environment**:\r\n\r\n- Dask version: 2021.3.0\r\n- Distributed version: 2021.3.0\r\n- Python version: 3.8.8\r\n- Operating System: Pop!_OS 18.04 LTS\r\n- Install method (conda, pip, source): pip\r\n","number":7449,"title":"Blockwise with `concatenate=True` broken with LocalCluster + `optimize_graph=False` "}],"string":"[\n {\n \"body\": \"**What happened**:\\r\\nWhen using a LocalCluster (and probably the distributed scheduler in general), setting `optimize_graph=False` causes strange (and incorrect) behaviour in Blockwise with `concatentate=True`. \\r\\n\\r\\n**What you expected to happen**:\\r\\nBlockwise with `concatenate=True` should function as normal.\\r\\n\\r\\n**Minimal Complete Verifiable Example**:\\r\\n\\r\\n```python\\r\\nimport dask.array as da\\r\\nfrom distributed import LocalCluster, Client\\r\\n\\r\\n\\r\\ndef f(x, y):\\r\\n\\r\\n print(y)\\r\\n\\r\\n return x\\r\\n\\r\\n\\r\\nif __name__ == '__main__':\\r\\n\\r\\n cluster = LocalCluster(processes=False,\\r\\n n_workers=1,\\r\\n threads_per_worker=1)\\r\\n\\r\\n client = Client(cluster)\\r\\n\\r\\n x = da.array([0])\\r\\n y = da.array([[0]])\\r\\n\\r\\n z = da.blockwise(\\r\\n f, (\\\"i\\\"),\\r\\n x, (\\\"i\\\"),\\r\\n y, (\\\"ij\\\"),\\r\\n dtype=x.dtype,\\r\\n concatenate=True)\\r\\n\\r\\n da.compute(z, optimize_graph=False)\\r\\n```\\r\\n\\r\\n**Anything else we need to know?**:\\r\\nThe example above will print something like:\\r\\n```\\r\\n(<function concatenate_axes at 0x7f153d45c310>, [array([[0]])], [1])\\r\\n```\\r\\nThis is not what is expected - we expect an array. Note that the above example will work as normal when:\\r\\n- `optimize_graph=True`\\r\\n- A different scheduler is used.\\r\\n\\r\\nApologies if this should have been posted on `distributed` instead.\\r\\n\\r\\n**Environment**:\\r\\n\\r\\n- Dask version: 2021.3.0\\r\\n- Distributed version: 2021.3.0\\r\\n- Python version: 3.8.8\\r\\n- Operating System: Pop!_OS 18.04 LTS\\r\\n- Install method (conda, pip, source): pip\\r\\n\",\n \"number\": 7449,\n \"title\": \"Blockwise with `concatenate=True` broken with LocalCluster + `optimize_graph=False` \"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"4bc3979333a3f3efff7ef38486107e60df7b5b56"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"e4ec2f2be16147c68919287752e1f76bea67b3a2\",\n \"head_commit_message\": \"use simpler SerializedFunction wrapper\",\n \"patch_to_review\": \"diff --git a/dask/blockwise.py b/dask/blockwise.py\\nindex e116d26c04b..c1bf3588dab 100644\\n--- a/dask/blockwise.py\\n+++ b/dask/blockwise.py\\n@@ -417,6 +417,8 @@ def __dask_distributed_pack__(\\n \\n @classmethod\\n def __dask_distributed_unpack__(cls, state, dsk, dependencies):\\n+ from .layers import SerializedFunction\\n+\\n # Make sure we convert list items back from tuples in `indices`.\\n # The msgpack serialization will have converted lists into\\n # tuples, and tuples may be stringified during graph\\n@@ -427,7 +429,7 @@ def __dask_distributed_unpack__(cls, state, dsk, dependencies):\\n ]\\n \\n layer_dsk, layer_deps = make_blockwise_graph(\\n- state[\\\"func\\\"],\\n+ SerializedFunction(state[\\\"func\\\"]),\\n state[\\\"output\\\"],\\n state[\\\"output_indices\\\"],\\n *indices,\\n@@ -821,8 +823,8 @@ def make_blockwise_graph(\\n key_deps = {}\\n \\n if deserializing:\\n- from distributed.worker import warn_dumps, dumps_function\\n from distributed.protocol.serialize import import_allowed_module\\n+ from distributed.protocol import to_serialize\\n else:\\n from importlib import import_module as import_allowed_module\\n \\n@@ -917,21 +919,12 @@ def make_blockwise_graph(\\n if deserializing:\\n deps.update(func_future_args)\\n args += list(func_future_args)\\n- if kwargs:\\n- val = {\\n- \\\"function\\\": dumps_function(apply),\\n- \\\"args\\\": warn_dumps(args),\\n- \\\"kwargs\\\": warn_dumps(kwargs2),\\n- }\\n- else:\\n- val = {\\\"function\\\": func, \\\"args\\\": warn_dumps(args)}\\n+ if kwargs:\\n+ val = (apply, func, args, kwargs2)\\n else:\\n- if kwargs:\\n- val = (apply, func, args, kwargs2)\\n- else:\\n- args.insert(0, func)\\n- val = tuple(args)\\n- dsk[out_key] = val\\n+ args.insert(0, func)\\n+ val = tuple(args)\\n+ dsk[out_key] = to_serialize(val) if deserializing else val\\n if return_key_deps:\\n key_deps[out_key] = deps\\n \\ndiff --git a/dask/layers.py b/dask/layers.py\\nindex 6a55f3e2485..a8efec11b28 100644\\n--- a/dask/layers.py\\n+++ b/dask/layers.py\\n@@ -31,6 +31,16 @@ def __call__(self, *args, **kwargs):\\n return import_term(self.function_path)(*args, **kwargs)\\n \\n \\n+class SerializedFunction:\\n+ def __init__(self, func):\\n+ self.func = func\\n+\\n+ def __call__(self, *args, **kwargs):\\n+ from distributed.worker import loads_function\\n+\\n+ return loads_function(self.func)(*args, **kwargs)\\n+\\n+\\n #\\n ##\\n ### Array Layers & Utilities\\ndiff --git a/dask/tests/test_distributed.py b/dask/tests/test_distributed.py\\nindex 4b2bb0ffcb5..f930b2a7fc1 100644\\n--- a/dask/tests/test_distributed.py\\n+++ b/dask/tests/test_distributed.py\\n@@ -398,3 +398,30 @@ async def test_annotation_pack_unpack(c, s, a, b):\\n unpacked_hlg = HighLevelGraph.__dask_distributed_unpack__(packed_hlg, annotations)\\n annotations = unpacked_hlg[\\\"annotations\\\"]\\n assert annotations == {\\\"workers\\\": {\\\"n\\\": (\\\"alice\\\",)}}\\n+\\n+\\n+@gen_cluster(client=True)\\n+async def test_blockwise_concatenate(c, s, a, b):\\n+ \\\"\\\"\\\"Test a blockwise operation with concatenated axes\\\"\\\"\\\"\\n+ da = pytest.importorskip(\\\"dask.array\\\")\\n+ np = pytest.importorskip(\\\"numpy\\\")\\n+\\n+ def f(x, y):\\n+ da.assert_eq(y, [[0, 1, 2]])\\n+ return x\\n+\\n+ x = da.from_array(np.array([0, 1, 2]))\\n+ y = da.from_array(np.array([[0, 1, 2]]))\\n+ z = da.blockwise(\\n+ f,\\n+ (\\\"i\\\"),\\n+ x,\\n+ (\\\"i\\\"),\\n+ y,\\n+ (\\\"ij\\\"),\\n+ dtype=x.dtype,\\n+ concatenate=True,\\n+ )\\n+\\n+ await c.compute(z, optimize_graph=False)\\n+ da.assert_eq(z, x)\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -917,21 +919,12 @@ def make_blockwise_graph(\n if deserializing:\n deps.update(func_future_args)\n args += list(func_future_args)\n- if kwargs:\n- val = {\n- \"function\": dumps_function(apply),\n- \"args\": warn_dumps(args),\n- \"kwargs\": warn_dumps(kwargs2),\n- }\n- else:\n- val = {\"function\": func, \"args\": warn_dumps(args)}\n+ if kwargs:\n+ val = (apply, func, args, kwargs2)","line":null,"original_line":923,"original_start_line":920,"path":"dask/blockwise.py","start_line":null,"text":"@author:\n@user1 and @user2-r-rose - I am able to handle in-lined tasks and avoid the extra `dumps` calls here if I wrap the function in something simple (to make it \"callable\" again). However, I am thinking that I am still missing the best way to use the existing serialization machinery (otherwise, the best long-term solution may require improvements in `distributed`/`Serialize`).\r\n\r\nThe current challenge, both here and in #7417, seems to be that we cannot serialize only the function and/or task arguments (or a subset of them) on the client, and then also serialize the complete task on the scheduler (which is necessary to send the task to a worker). I would expect that the `serialize` logic would come across a `Serialized` object, and incorperate the header/frames into the *new* `Serialized` object so that calling `deserialize` on the final object would also deserialize the embedded object. However, for some reason, this does not seem to be the case. (note that I'm still looking into this...)\n\n@author:\nAh- It looks like this is another case where we just need to add an `iterate_collection=` argument to `serialize`. If we require the serialization procedure to treat the elements of a collection separately, the nested serialization seems to work for me :)"},{"diff_hunk":"@@ -917,21 +919,12 @@ def make_blockwise_graph(\n if deserializing:\n deps.update(func_future_args)\n args += list(func_future_args)\n- if kwargs:\n- val = {\n- \"function\": dumps_function(apply),\n- \"args\": warn_dumps(args),\n- \"kwargs\": warn_dumps(kwargs2),\n- }\n- else:\n- val = {\"function\": func, \"args\": warn_dumps(args)}\n+ if kwargs:\n+ val = (apply, func, args, kwargs2)\n else:\n- if kwargs:\n- val = (apply, func, args, kwargs2)\n- else:\n- args.insert(0, func)\n- val = tuple(args)\n- dsk[out_key] = val\n+ args.insert(0, func)\n+ val = tuple(args)\n+ dsk[out_key] = to_serialize(val) if deserializing else val","line":null,"original_line":927,"original_start_line":null,"path":"dask/blockwise.py","start_line":null,"text":"@author:\nNote that, if [distributed#4641](https://github.com/dask/distributed/pull/4641) gets in, we can do something like:\r\n\r\n```\r\ndsk[out_key] = Serialized(*serialize(val, iterate_collection=True)) if deserializing else val\r\n```\r\n\r\nand then the `SerializedFunction` wrapper becomes completely unnecessary :)\n\n@user1:\nJust a heads up, when using https://github.com/dask/distributed/pull/4575, `to_serialize` should work here:\r\n\r\n```python\r\ndsk[out_key] = to_serialize(val) if deserializing else val\r\n```\n\n@author:\nAh, cool - thanks! I'll give that a try.\n\n@user2:\nThat PR still has other issues though. So something to be aware of\n\n@author:\n>That PR still has other issues though. So something to be aware of\r\n\r\nThanks for the heads up John. Is there anything specific that we can do to help? It seems that Blockwise-IO serialization may be blocked in dask/dask until something like your PR gets through in dask/distributed :)"}],"string":"[\n {\n \"diff_hunk\": \"@@ -917,21 +919,12 @@ def make_blockwise_graph(\\n if deserializing:\\n deps.update(func_future_args)\\n args += list(func_future_args)\\n- if kwargs:\\n- val = {\\n- \\\"function\\\": dumps_function(apply),\\n- \\\"args\\\": warn_dumps(args),\\n- \\\"kwargs\\\": warn_dumps(kwargs2),\\n- }\\n- else:\\n- val = {\\\"function\\\": func, \\\"args\\\": warn_dumps(args)}\\n+ if kwargs:\\n+ val = (apply, func, args, kwargs2)\",\n \"line\": null,\n \"original_line\": 923,\n \"original_start_line\": 920,\n \"path\": \"dask/blockwise.py\",\n \"start_line\": null,\n \"text\": \"@author:\\n@user1 and @user2-r-rose - I am able to handle in-lined tasks and avoid the extra `dumps` calls here if I wrap the function in something simple (to make it \\\"callable\\\" again). However, I am thinking that I am still missing the best way to use the existing serialization machinery (otherwise, the best long-term solution may require improvements in `distributed`/`Serialize`).\\r\\n\\r\\nThe current challenge, both here and in #7417, seems to be that we cannot serialize only the function and/or task arguments (or a subset of them) on the client, and then also serialize the complete task on the scheduler (which is necessary to send the task to a worker). I would expect that the `serialize` logic would come across a `Serialized` object, and incorperate the header/frames into the *new* `Serialized` object so that calling `deserialize` on the final object would also deserialize the embedded object. However, for some reason, this does not seem to be the case. (note that I'm still looking into this...)\\n\\n@author:\\nAh- It looks like this is another case where we just need to add an `iterate_collection=` argument to `serialize`. If we require the serialization procedure to treat the elements of a collection separately, the nested serialization seems to work for me :)\"\n },\n {\n \"diff_hunk\": \"@@ -917,21 +919,12 @@ def make_blockwise_graph(\\n if deserializing:\\n deps.update(func_future_args)\\n args += list(func_future_args)\\n- if kwargs:\\n- val = {\\n- \\\"function\\\": dumps_function(apply),\\n- \\\"args\\\": warn_dumps(args),\\n- \\\"kwargs\\\": warn_dumps(kwargs2),\\n- }\\n- else:\\n- val = {\\\"function\\\": func, \\\"args\\\": warn_dumps(args)}\\n+ if kwargs:\\n+ val = (apply, func, args, kwargs2)\\n else:\\n- if kwargs:\\n- val = (apply, func, args, kwargs2)\\n- else:\\n- args.insert(0, func)\\n- val = tuple(args)\\n- dsk[out_key] = val\\n+ args.insert(0, func)\\n+ val = tuple(args)\\n+ dsk[out_key] = to_serialize(val) if deserializing else val\",\n \"line\": null,\n \"original_line\": 927,\n \"original_start_line\": null,\n \"path\": \"dask/blockwise.py\",\n \"start_line\": null,\n \"text\": \"@author:\\nNote that, if [distributed#4641](https://github.com/dask/distributed/pull/4641) gets in, we can do something like:\\r\\n\\r\\n```\\r\\ndsk[out_key] = Serialized(*serialize(val, iterate_collection=True)) if deserializing else val\\r\\n```\\r\\n\\r\\nand then the `SerializedFunction` wrapper becomes completely unnecessary :)\\n\\n@user1:\\nJust a heads up, when using https://github.com/dask/distributed/pull/4575, `to_serialize` should work here:\\r\\n\\r\\n```python\\r\\ndsk[out_key] = to_serialize(val) if deserializing else val\\r\\n```\\n\\n@author:\\nAh, cool - thanks! I'll give that a try.\\n\\n@user2:\\nThat PR still has other issues though. So something to be aware of\\n\\n@author:\\n>That PR still has other issues though. So something to be aware of\\r\\n\\r\\nThanks for the heads up John. Is there anything specific that we can do to help? It seems that Blockwise-IO serialization may be blocked in dask/dask until something like your PR gets through in dask/distributed :)\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"dcac77245dee623906abb61e3c315d20b2ccd23f"},"merged_patch":{"kind":"string","value":"diff --git a/continuous_integration/environment-mindeps-distributed.yaml b/continuous_integration/environment-mindeps-distributed.yaml\nindex c41e78995e0..8742c65f649 100644\n--- a/continuous_integration/environment-mindeps-distributed.yaml\n+++ b/continuous_integration/environment-mindeps-distributed.yaml\n@@ -10,7 +10,10 @@ dependencies:\n - fsspec=0.6.0\n - toolz=0.8.2\n # optional dependencies pulled in by pip install dask[distributed]\n- - distributed=2021.03.0\n+ # TODO: Use distributed-2021.04.1 when it becomes available\n+ - pip\n+ - pip:\n+ - git+https://github.com/dask/distributed.git\n # test dependencies\n - pytest\n - pytest-rerunfailures\ndiff --git a/dask/blockwise.py b/dask/blockwise.py\nindex a5138f38ba8..443ad6d68cf 100644\n--- a/dask/blockwise.py\n+++ b/dask/blockwise.py\n@@ -342,6 +342,7 @@ def is_materialized(self):\n def __dask_distributed_pack__(\n self, all_hlg_keys, known_key_dependencies, client, client_keys\n ):\n+ from distributed.protocol import to_serialize\n from distributed.protocol.serialize import import_allowed_module\n from distributed.utils import CancelledError\n from distributed.utils_comm import unpack_remotedata\n@@ -363,7 +364,9 @@ def __dask_distributed_pack__(\n dsk = (SubgraphCallable(dsk, self.output, tuple(keys2)),)\n dsk, dsk_unpacked_futures = unpack_remotedata(dsk, byte_keys=True)\n \n- func = dumps_function(dsk[0])\n+ # Dump the function if concatenate is False, because\n+ # we will not need to construct a nested task\n+ func = to_serialize(dsk[0]) if self.concatenate else dumps_function(dsk[0])\n func_future_args = dsk[1:]\n \n indices = list(toolz.concat(indices2))\n@@ -819,8 +822,8 @@ def make_blockwise_graph(\n key_deps = {}\n \n if deserializing:\n- from distributed.protocol.serialize import import_allowed_module\n- from distributed.worker import dumps_function, warn_dumps\n+ from distributed.protocol.serialize import import_allowed_module, to_serialize\n+ from distributed.worker import dumps_function\n else:\n from importlib import import_module as import_allowed_module\n \n@@ -915,21 +918,30 @@ def make_blockwise_graph(\n if deserializing:\n deps.update(func_future_args)\n args += list(func_future_args)\n+\n+ if deserializing and not concatenate:\n+ # Construct a function/args/kwargs dict if we\n+ # do not have a nested task (i.e. concatenate=False).\n+ # TODO: Avoid using the iterate_collection-version\n+ # of to_serialize if we know that are no embeded\n+ # Serialized/Serialize objects in args and/or kwargs.\n if kwargs:\n- val = {\n+ dsk[out_key] = {\n \"function\": dumps_function(apply),\n- \"args\": warn_dumps(args),\n- \"kwargs\": warn_dumps(kwargs2),\n+ \"args\": to_serialize(args),\n+ \"kwargs\": to_serialize(kwargs2),\n }\n else:\n- val = {\"function\": func, \"args\": warn_dumps(args)}\n+ dsk[out_key] = {\"function\": func, \"args\": to_serialize(args)}\n else:\n if kwargs:\n val = (apply, func, args, kwargs2)\n else:\n args.insert(0, func)\n val = tuple(args)\n- dsk[out_key] = val\n+ # May still need to serialize (if concatenate=True)\n+ dsk[out_key] = to_serialize(val) if deserializing else val\n+\n if return_key_deps:\n key_deps[out_key] = deps\n \ndiff --git a/dask/tests/test_distributed.py b/dask/tests/test_distributed.py\nindex 426962c98a9..2e520872bb8 100644\n--- a/dask/tests/test_distributed.py\n+++ b/dask/tests/test_distributed.py\n@@ -379,6 +379,33 @@ def add(x, y, z, extra_arg):\n assert res == 21\n \n \n+@gen_cluster(client=True)\n+async def test_blockwise_concatenate(c, s, a, b):\n+ \"\"\"Test a blockwise operation with concatenated axes\"\"\"\n+ da = pytest.importorskip(\"dask.array\")\n+ np = pytest.importorskip(\"numpy\")\n+\n+ def f(x, y):\n+ da.assert_eq(y, [[0, 1, 2]])\n+ return x\n+\n+ x = da.from_array(np.array([0, 1, 2]))\n+ y = da.from_array(np.array([[0, 1, 2]]))\n+ z = da.blockwise(\n+ f,\n+ (\"i\"),\n+ x,\n+ (\"i\"),\n+ y,\n+ (\"ij\"),\n+ dtype=x.dtype,\n+ concatenate=True,\n+ )\n+\n+ await c.compute(z, optimize_graph=False)\n+ da.assert_eq(z, x)\n+\n+\n @gen_cluster(client=True)\n async def test_map_partitions_partition_info(c, s, a, b):\n dd = pytest.importorskip(\"dask.dataframe\")\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 4,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2389,"cells":{"instance_id":{"kind":"string","value":"dask__dask-4525@8f33dcc"},"repo":{"kind":"string","value":"dask/dask"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":4525,"string":"4,525"},"title":{"kind":"string","value":"Fixed mean() and moment() on sparse arrays"},"body":{"kind":"string","value":"For proper creation of sparse auxiliary arrays, a dispatcher for ones_like has\r\nbeen added. However, sparse arrays created from ones_like cause sparse\r\nreductions to fail, as it would result in a dense array. To fix that, the arrays\r\nhave first to be converted to dense before, which ends up requiring a new\r\ndispatcher for that purpose, and for already dense arrays must be bypassed, that\r\nis here implemented as numpy.ndarray.view() to simply return a shallow copy of\r\nthe array.\r\n\r\nThis commit fixes https://github.com/dask/dask/issues/4523 and adds the tests\r\nsuggested in that issue.\r\n\r\n@mrocklin \r\n\r\n- [ ] Tests added / passed\r\n- [ ] Passes `flake8 dask`"},"created_at":{"kind":"string","value":"2019-02-25T13:53:40Z"},"problem_statement":{"kind":"string","value":"Some functions fail on Dask arrays from sparse\nShort sample for reproduction and traceback follow.\r\n\r\n```python\r\nimport numpy as np\r\nimport sparse\r\nimport dask.array as da\r\nfrom numpy.testing import assert_array_equal\r\n\r\nx = da.random.random((2, 3, 4), chunks=(1, 2, 2))\r\nx[x < 0.8] = 0\r\n\r\ny = x.map_blocks(sparse.COO.from_numpy)\r\n\r\nxx = x.mean()\r\nyy = y.mean()\r\n\r\nassert_array_equal(xx, yy)\r\n```\r\n\r\n```python\r\nTraceback (most recent call last):\r\n File \"dask_sparse.py\", line 14, in <module>\r\n assert_array_equal(xx, yy)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/testing/_private/utils.py\", line 894, in assert_array_equal\r\n verbose=verbose, header='Arrays are not equal')\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/testing/_private/utils.py\", line 697, in assert_array_compare\r\n y = array(y, copy=False, subok=True)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/core.py\", line 998, in __array__\r\n x = self.compute()\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/base.py\", line 156, in compute\r\n (result,) = compute(self, traverse=False, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/base.py\", line 398, in compute\r\n results = schedule(dsk, keys, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/threaded.py\", line 76, in get\r\n pack_exception=pack_exception, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\", line 475, in get_async\r\n finish(dsk, state, not succeeded)\r\n File \"/usr/lib/python3.5/contextlib.py\", line 77, in __exit__\r\n self.gen.throw(type, value, traceback)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/callbacks.py\", line 99, in local_callbacks\r\n yield callbacks or ()\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\", line 460, in get_async\r\n raise_exception(exc, tb)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/compatibility.py\", line 112, in reraise\r\n raise exc \r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\", line 230, in execute_task\r\n result = _execute_task(task, data)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\", line 119, in _execute_task\r\n return func(*args2)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/optimization.py\", line 942, in __call__\r\n dict(zip(self.inkeys, args)))\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\", line 149, in get\r\n result = _execute_task(task, cache)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\", line 119, in _execute_task\r\n return func(*args2)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/compatibility.py\", line 93, in apply\r\n return func(*args, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/reductions.py\", line 332, in mean_chunk\r\n n = numel(x, dtype=dtype, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/reductions.py\", line 323, in numel\r\n return chunk.sum(np.ones_like(x), **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/overrides.py\", line 151, in public_api\r\n implementation, public_api, relevant_args, args, kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/numeric.py\", line 289, in ones_like\r\n res = empty_like(a, dtype=dtype, order=order, subok=subok)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/overrides.py\", line 151, in public_api\r\n implementation, public_api, relevant_args, args, kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/sparse/sparse_array.py\", line 213, in __array__\r\n raise RuntimeError('Cannot convert a sparse array to dense automatically. '\r\nRuntimeError: Cannot convert a sparse array to dense automatically. To manually densify, use the todense method.\r\n```\r\n\r\nAnother function that fails with same error besides `mean()` is `std()`. After fixing the error, we have to make sure to add both functions to sparse tests, inside the `functions` list."},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"Short sample for reproduction and traceback follow.\r\n\r\n```python\r\nimport numpy as np\r\nimport sparse\r\nimport dask.array as da\r\nfrom numpy.testing import assert_array_equal\r\n\r\nx = da.random.random((2, 3, 4), chunks=(1, 2, 2))\r\nx[x < 0.8] = 0\r\n\r\ny = x.map_blocks(sparse.COO.from_numpy)\r\n\r\nxx = x.mean()\r\nyy = y.mean()\r\n\r\nassert_array_equal(xx, yy)\r\n```\r\n\r\n```python\r\nTraceback (most recent call last):\r\n File \"dask_sparse.py\", line 14, in <module>\r\n assert_array_equal(xx, yy)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/testing/_private/utils.py\", line 894, in assert_array_equal\r\n verbose=verbose, header='Arrays are not equal')\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/testing/_private/utils.py\", line 697, in assert_array_compare\r\n y = array(y, copy=False, subok=True)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/core.py\", line 998, in __array__\r\n x = self.compute()\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/base.py\", line 156, in compute\r\n (result,) = compute(self, traverse=False, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/base.py\", line 398, in compute\r\n results = schedule(dsk, keys, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/threaded.py\", line 76, in get\r\n pack_exception=pack_exception, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\", line 475, in get_async\r\n finish(dsk, state, not succeeded)\r\n File \"/usr/lib/python3.5/contextlib.py\", line 77, in __exit__\r\n self.gen.throw(type, value, traceback)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/callbacks.py\", line 99, in local_callbacks\r\n yield callbacks or ()\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\", line 460, in get_async\r\n raise_exception(exc, tb)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/compatibility.py\", line 112, in reraise\r\n raise exc \r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\", line 230, in execute_task\r\n result = _execute_task(task, data)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\", line 119, in _execute_task\r\n return func(*args2)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/optimization.py\", line 942, in __call__\r\n dict(zip(self.inkeys, args)))\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\", line 149, in get\r\n result = _execute_task(task, cache)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\", line 119, in _execute_task\r\n return func(*args2)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/compatibility.py\", line 93, in apply\r\n return func(*args, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/reductions.py\", line 332, in mean_chunk\r\n n = numel(x, dtype=dtype, **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/reductions.py\", line 323, in numel\r\n return chunk.sum(np.ones_like(x), **kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/overrides.py\", line 151, in public_api\r\n implementation, public_api, relevant_args, args, kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/numeric.py\", line 289, in ones_like\r\n res = empty_like(a, dtype=dtype, order=order, subok=subok)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/overrides.py\", line 151, in public_api\r\n implementation, public_api, relevant_args, args, kwargs)\r\n File \"/home/pentschev/.local/lib/python3.5/site-packages/sparse/sparse_array.py\", line 213, in __array__\r\n raise RuntimeError('Cannot convert a sparse array to dense automatically. '\r\nRuntimeError: Cannot convert a sparse array to dense automatically. To manually densify, use the todense method.\r\n```\r\n\r\nAnother function that fails with same error besides `mean()` is `std()`. After fixing the error, we have to make sure to add both functions to sparse tests, inside the `functions` list.","number":4523,"title":"Some functions fail on Dask arrays from sparse"}],"string":"[\n {\n \"body\": \"Short sample for reproduction and traceback follow.\\r\\n\\r\\n```python\\r\\nimport numpy as np\\r\\nimport sparse\\r\\nimport dask.array as da\\r\\nfrom numpy.testing import assert_array_equal\\r\\n\\r\\nx = da.random.random((2, 3, 4), chunks=(1, 2, 2))\\r\\nx[x < 0.8] = 0\\r\\n\\r\\ny = x.map_blocks(sparse.COO.from_numpy)\\r\\n\\r\\nxx = x.mean()\\r\\nyy = y.mean()\\r\\n\\r\\nassert_array_equal(xx, yy)\\r\\n```\\r\\n\\r\\n```python\\r\\nTraceback (most recent call last):\\r\\n File \\\"dask_sparse.py\\\", line 14, in <module>\\r\\n assert_array_equal(xx, yy)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/numpy/testing/_private/utils.py\\\", line 894, in assert_array_equal\\r\\n verbose=verbose, header='Arrays are not equal')\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/numpy/testing/_private/utils.py\\\", line 697, in assert_array_compare\\r\\n y = array(y, copy=False, subok=True)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/core.py\\\", line 998, in __array__\\r\\n x = self.compute()\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/base.py\\\", line 156, in compute\\r\\n (result,) = compute(self, traverse=False, **kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/base.py\\\", line 398, in compute\\r\\n results = schedule(dsk, keys, **kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/threaded.py\\\", line 76, in get\\r\\n pack_exception=pack_exception, **kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\\\", line 475, in get_async\\r\\n finish(dsk, state, not succeeded)\\r\\n File \\\"/usr/lib/python3.5/contextlib.py\\\", line 77, in __exit__\\r\\n self.gen.throw(type, value, traceback)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/callbacks.py\\\", line 99, in local_callbacks\\r\\n yield callbacks or ()\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\\\", line 460, in get_async\\r\\n raise_exception(exc, tb)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/compatibility.py\\\", line 112, in reraise\\r\\n raise exc \\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/local.py\\\", line 230, in execute_task\\r\\n result = _execute_task(task, data)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\\\", line 119, in _execute_task\\r\\n return func(*args2)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/optimization.py\\\", line 942, in __call__\\r\\n dict(zip(self.inkeys, args)))\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\\\", line 149, in get\\r\\n result = _execute_task(task, cache)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/core.py\\\", line 119, in _execute_task\\r\\n return func(*args2)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/compatibility.py\\\", line 93, in apply\\r\\n return func(*args, **kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/reductions.py\\\", line 332, in mean_chunk\\r\\n n = numel(x, dtype=dtype, **kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/dask/array/reductions.py\\\", line 323, in numel\\r\\n return chunk.sum(np.ones_like(x), **kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/overrides.py\\\", line 151, in public_api\\r\\n implementation, public_api, relevant_args, args, kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/numeric.py\\\", line 289, in ones_like\\r\\n res = empty_like(a, dtype=dtype, order=order, subok=subok)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/numpy/core/overrides.py\\\", line 151, in public_api\\r\\n implementation, public_api, relevant_args, args, kwargs)\\r\\n File \\\"/home/pentschev/.local/lib/python3.5/site-packages/sparse/sparse_array.py\\\", line 213, in __array__\\r\\n raise RuntimeError('Cannot convert a sparse array to dense automatically. '\\r\\nRuntimeError: Cannot convert a sparse array to dense automatically. To manually densify, use the todense method.\\r\\n```\\r\\n\\r\\nAnother function that fails with same error besides `mean()` is `std()`. After fixing the error, we have to make sure to add both functions to sparse tests, inside the `functions` list.\",\n \"number\": 4523,\n \"title\": \"Some functions fail on Dask arrays from sparse\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"0780ca545a05935f9105bd0fd70dbb04b55986fd"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"8f33dccd3d95c5e1e7040f174790f0c1eef1262e\",\n \"head_commit_message\": \"Workaround for mkl.fft failures in test_array_function.py\",\n \"patch_to_review\": \"diff --git a/.travis.yml b/.travis.yml\\nindex 7f864c96f36..893598788e3 100644\\n--- a/.travis.yml\\n+++ b/.travis.yml\\n@@ -47,10 +47,12 @@ jobs:\\n - PYTHON=3.7\\n - NUMPY=1.16.2\\n - PANDAS>=0.24.1\\n+ - UPSTREAM_SPARSE=1\\n - *test_and_lint\\n - *no_coverage\\n - *no_optimize\\n - *imports\\n+ - *array_function\\n \\n - env: &py36_dev\\n - UPSTREAM_DEV=1 # Install nightly versions of NumPy, pandas, pyarrow\\ndiff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh\\nindex 48483888c96..87da7b4ddf3 100644\\n--- a/continuous_integration/travis/install.sh\\n+++ b/continuous_integration/travis/install.sh\\n@@ -75,7 +75,11 @@ if [[ $PYTHONOPTIMIZE != '2' ]] && [[ $NUMPY > '1.11.0' ]] && [[ $NUMPY < '1.14.\\n fi\\n \\n if [[ $NUMPY > '1.13.0' ]]; then\\n- pip install sparse \\n+ if [[ ${UPSTREAM_SPARSE} ]]; then\\n+ pip install --upgrade git+https://github.com/pydata/sparse\\n+ else\\n+ pip install sparse\\n+ fi\\n fi\\n \\n if [[ $PYTHON == '2.7' ]]; then\\ndiff --git a/dask/array/reductions.py b/dask/array/reductions.py\\nindex 4d62861517b..7f099e255f4 100644\\n--- a/dask/array/reductions.py\\n+++ b/dask/array/reductions.py\\n@@ -320,7 +320,30 @@ def nanmax(a, axis=None, keepdims=False, split_every=None, out=None):\\n \\n def numel(x, **kwargs):\\n \\\"\\\"\\\" A reduction to count the number of elements \\\"\\\"\\\"\\n- return chunk.sum(np.ones_like(x), **kwargs)\\n+\\n+ if hasattr(x, 'mask'):\\n+ return chunk.sum(np.ones_like(x), **kwargs)\\n+\\n+ shape = x.shape\\n+ keepdims = kwargs.get('keepdims', False)\\n+ axis = kwargs.get('axis', None)\\n+ dtype = kwargs.get('dtype', np.float64)\\n+\\n+ if axis is None:\\n+ prod = np.prod(shape, dtype=dtype)\\n+ return np.full((1,) * len(shape), prod, dtype=dtype) if keepdims is True else prod\\n+\\n+ if not isinstance(axis, tuple or list):\\n+ axis = [axis]\\n+ else:\\n+ axis = sorted(axis)\\n+\\n+ prod = np.prod([shape[dim] for dim in axis])\\n+ if keepdims is True:\\n+ new_shape = [shape[dim] if dim not in axis else 1 for dim in range(len(shape))]\\n+ else:\\n+ new_shape = [shape[dim] for dim in range(len(shape)) if dim not in axis]\\n+ return np.full(new_shape, prod, dtype=dtype)\\n \\n \\n def nannumel(x, **kwargs):\\ndiff --git a/dask/array/tests/test_array_function.py b/dask/array/tests/test_array_function.py\\nindex 2ea48c127db..895bf28765b 100644\\n--- a/dask/array/tests/test_array_function.py\\n+++ b/dask/array/tests/test_array_function.py\\n@@ -26,8 +26,6 @@\\n lambda x: np.sum(x),\\n lambda x: np.var(x),\\n lambda x: np.vstack(x),\\n- lambda x: np.fft.fft(x.rechunk(x.shape) if isinstance(x, da.Array) else x),\\n- lambda x: np.fft.fft2(x.rechunk(x.shape) if isinstance(x, da.Array) else x),\\n lambda x: np.linalg.norm(x)])\\n def test_array_function_dask(func):\\n x = np.random.random((100, 100))\\n@@ -39,6 +37,19 @@ def test_array_function_dask(func):\\n assert_eq(res_y, res_x)\\n \\n \\n+@pytest.mark.skipif(missing_arrfunc_cond, reason=missing_arrfunc_reason)\\n+@pytest.mark.parametrize('func', [np.fft.fft, np.fft.fft2])\\n+def test_array_function_fft(func):\\n+ x = np.random.random((100, 100))\\n+ y = da.from_array(x, chunks=(100, 100))\\n+ res_x = func(x)\\n+ res_y = func(y)\\n+\\n+ if func.__module__ != 'mkl_fft._numpy_fft':\\n+ assert isinstance(res_y, da.Array)\\n+ assert_eq(res_y, res_x)\\n+\\n+\\n @pytest.mark.skipif(missing_arrfunc_cond, reason=missing_arrfunc_reason)\\n @pytest.mark.parametrize('func', [\\n lambda x: np.min_scalar_type(x),\\ndiff --git a/dask/array/tests/test_reductions.py b/dask/array/tests/test_reductions.py\\nindex bfc26ec9314..d72bad82cdc 100644\\n--- a/dask/array/tests/test_reductions.py\\n+++ b/dask/array/tests/test_reductions.py\\n@@ -5,6 +5,8 @@\\n import pytest\\n np = pytest.importorskip('numpy')\\n \\n+import itertools\\n+\\n import dask.array as da\\n from dask.array.utils import assert_eq as _assert_eq, same_keys\\n from dask.core import get_deps\\n@@ -15,6 +17,23 @@ def assert_eq(a, b):\\n _assert_eq(a, b, equal_nan=True)\\n \\n \\n+@pytest.mark.parametrize('dtype', ['f4', 'i4'])\\n+@pytest.mark.parametrize('keepdims', [True, False])\\n+def test_numel(dtype, keepdims):\\n+ x = np.ones((2, 3, 4))\\n+\\n+ for length in range(x.ndim):\\n+ for sub in itertools.combinations([d for d in range(x.ndim)], length):\\n+ assert_eq(da.reductions.numel(x, axis=sub, keepdims=keepdims, dtype=dtype),\\n+ np.sum(x, axis=sub, keepdims=keepdims, dtype=dtype))\\n+\\n+ for length in range(x.ndim):\\n+ for sub in itertools.combinations([d for d in range(x.ndim)], length):\\n+ ssub = np.random.shuffle(list(sub))\\n+ assert_eq(da.reductions.numel(x, axis=ssub, keepdims=keepdims, dtype=dtype),\\n+ np.sum(x, axis=ssub, keepdims=keepdims, dtype=dtype))\\n+\\n+\\n def reduction_1d_test(da_func, darr, np_func, narr, use_dtype=True, split_every=True):\\n assert_eq(da_func(darr), np_func(narr))\\n assert_eq(da_func(darr, keepdims=True), np_func(narr, keepdims=True))\\ndiff --git a/dask/array/tests/test_sparse.py b/dask/array/tests/test_sparse.py\\nindex 459609defab..4d565ffc45f 100644\\n--- a/dask/array/tests/test_sparse.py\\n+++ b/dask/array/tests/test_sparse.py\\n@@ -33,6 +33,12 @@\\n lambda x: x.T,\\n lambda x: da.transpose(x, (1, 2, 0)),\\n lambda x: x.sum(),\\n+ lambda x: x.mean(),\\n+ lambda x: x.moment(order=0),\\n+ pytest.param(lambda x: x.std(),\\n+ marks=pytest.mark.xfail(reason=\\\"fixed in https://github.com/pydata/sparse/pull/243\\\")),\\n+ pytest.param(lambda x: x.var(),\\n+ marks=pytest.mark.xfail(reason=\\\"fixed in https://github.com/pydata/sparse/pull/243\\\")),\\n lambda x: x.dot(np.arange(x.shape[-1])),\\n lambda x: x.dot(np.eye(x.shape[-1])),\\n lambda x: da.tensordot(x, np.ones(x.shape[:2]), axes=[(0, 1), (0, 1)]),\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -320,7 +320,30 @@ def nanmax(a, axis=None, keepdims=False, split_every=None, out=None):\n \n def numel(x, **kwargs):\n \"\"\" A reduction to count the number of elements \"\"\"\n- return chunk.sum(np.ones_like(x), **kwargs)\n+\n+ if hasattr(x, 'mask'):\n+ return chunk.sum(np.ones_like(x), **kwargs)\n+\n+ shape = x.shape\n+ keepdims = kwargs.get('keepdims', False)\n+ axis = kwargs.get('axis', None)\n+ dtype = kwargs.get('dtype', np.float64)\n+\n+ if axis is None:\n+ prod = np.prod(shape, dtype=dtype)\n+ return np.full((1,) * len(shape), prod, dtype=dtype) if keepdims is True else prod\n+\n+ if not isinstance(axis, tuple or list):\n+ axis = [axis]\n+ else:\n+ axis = sorted(axis)\n+\n+ prod = np.prod([shape[dim] for dim in axis])\n+ if keepdims is True:\n+ new_shape = [shape[dim] if dim not in axis else 1 for dim in range(len(shape))]\n+ else:\n+ new_shape = [shape[dim] for dim in range(len(shape)) if dim not in axis]","line":null,"original_line":345,"original_start_line":null,"path":"dask/array/reductions.py","start_line":null,"text":"@user1:\nThese should be `tuple`s since they are shapes.\n\n@author:\nFixed."}],"string":"[\n {\n \"diff_hunk\": \"@@ -320,7 +320,30 @@ def nanmax(a, axis=None, keepdims=False, split_every=None, out=None):\\n \\n def numel(x, **kwargs):\\n \\\"\\\"\\\" A reduction to count the number of elements \\\"\\\"\\\"\\n- return chunk.sum(np.ones_like(x), **kwargs)\\n+\\n+ if hasattr(x, 'mask'):\\n+ return chunk.sum(np.ones_like(x), **kwargs)\\n+\\n+ shape = x.shape\\n+ keepdims = kwargs.get('keepdims', False)\\n+ axis = kwargs.get('axis', None)\\n+ dtype = kwargs.get('dtype', np.float64)\\n+\\n+ if axis is None:\\n+ prod = np.prod(shape, dtype=dtype)\\n+ return np.full((1,) * len(shape), prod, dtype=dtype) if keepdims is True else prod\\n+\\n+ if not isinstance(axis, tuple or list):\\n+ axis = [axis]\\n+ else:\\n+ axis = sorted(axis)\\n+\\n+ prod = np.prod([shape[dim] for dim in axis])\\n+ if keepdims is True:\\n+ new_shape = [shape[dim] if dim not in axis else 1 for dim in range(len(shape))]\\n+ else:\\n+ new_shape = [shape[dim] for dim in range(len(shape)) if dim not in axis]\",\n \"line\": null,\n \"original_line\": 345,\n \"original_start_line\": null,\n \"path\": \"dask/array/reductions.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nThese should be `tuple`s since they are shapes.\\n\\n@author:\\nFixed.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"b700ddc65ebef6528b45d477e98dda0519656f1b"},"merged_patch":{"kind":"string","value":"diff --git a/.travis.yml b/.travis.yml\nindex 7de0412b195..1dd41c963ce 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -47,10 +47,12 @@ jobs:\n - PYTHON=3.7\n - NUMPY=1.16.2\n - PANDAS>=0.24.1\n+ - UPSTREAM_SPARSE=1\n - *test_and_lint\n - *no_coverage\n - *no_optimize\n - *imports\n+ - *array_function\n \n - env: &py36_dev\n - UPSTREAM_DEV=1 # Install nightly versions of NumPy, pandas, pyarrow\ndiff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh\nindex aee0f00e21a..dfa9f86aa7c 100644\n--- a/continuous_integration/travis/install.sh\n+++ b/continuous_integration/travis/install.sh\n@@ -78,7 +78,11 @@ if [[ $PYTHONOPTIMIZE != '2' ]] && [[ $NUMPY > '1.11.0' ]] && [[ $NUMPY < '1.14.\n fi\n \n if [[ $NUMPY > '1.13.0' ]]; then\n- pip install sparse \n+ if [[ ${UPSTREAM_SPARSE} ]]; then\n+ pip install --upgrade git+https://github.com/pydata/sparse\n+ else\n+ pip install sparse\n+ fi\n fi\n \n if [[ $PYTHON == '2.7' ]]; then\ndiff --git a/dask/array/reductions.py b/dask/array/reductions.py\nindex 4d62861517b..6b6a1c71f26 100644\n--- a/dask/array/reductions.py\n+++ b/dask/array/reductions.py\n@@ -320,7 +320,28 @@ def nanmax(a, axis=None, keepdims=False, split_every=None, out=None):\n \n def numel(x, **kwargs):\n \"\"\" A reduction to count the number of elements \"\"\"\n- return chunk.sum(np.ones_like(x), **kwargs)\n+\n+ if hasattr(x, 'mask'):\n+ return chunk.sum(np.ones_like(x), **kwargs)\n+\n+ shape = x.shape\n+ keepdims = kwargs.get('keepdims', False)\n+ axis = kwargs.get('axis', None)\n+ dtype = kwargs.get('dtype', np.float64)\n+\n+ if axis is None:\n+ prod = np.prod(shape, dtype=dtype)\n+ return np.full((1,) * len(shape), prod, dtype=dtype) if keepdims is True else prod\n+\n+ if not isinstance(axis, tuple or list):\n+ axis = [axis]\n+\n+ prod = np.prod([shape[dim] for dim in axis])\n+ if keepdims is True:\n+ new_shape = tuple(shape[dim] if dim not in axis else 1 for dim in range(len(shape)))\n+ else:\n+ new_shape = tuple(shape[dim] for dim in range(len(shape)) if dim not in axis)\n+ return np.full(new_shape, prod, dtype=dtype)\n \n \n def nannumel(x, **kwargs):\ndiff --git a/dask/array/tests/test_array_function.py b/dask/array/tests/test_array_function.py\nindex 2ea48c127db..895bf28765b 100644\n--- a/dask/array/tests/test_array_function.py\n+++ b/dask/array/tests/test_array_function.py\n@@ -26,8 +26,6 @@\n lambda x: np.sum(x),\n lambda x: np.var(x),\n lambda x: np.vstack(x),\n- lambda x: np.fft.fft(x.rechunk(x.shape) if isinstance(x, da.Array) else x),\n- lambda x: np.fft.fft2(x.rechunk(x.shape) if isinstance(x, da.Array) else x),\n lambda x: np.linalg.norm(x)])\n def test_array_function_dask(func):\n x = np.random.random((100, 100))\n@@ -39,6 +37,19 @@ def test_array_function_dask(func):\n assert_eq(res_y, res_x)\n \n \n+@pytest.mark.skipif(missing_arrfunc_cond, reason=missing_arrfunc_reason)\n+@pytest.mark.parametrize('func', [np.fft.fft, np.fft.fft2])\n+def test_array_function_fft(func):\n+ x = np.random.random((100, 100))\n+ y = da.from_array(x, chunks=(100, 100))\n+ res_x = func(x)\n+ res_y = func(y)\n+\n+ if func.__module__ != 'mkl_fft._numpy_fft':\n+ assert isinstance(res_y, da.Array)\n+ assert_eq(res_y, res_x)\n+\n+\n @pytest.mark.skipif(missing_arrfunc_cond, reason=missing_arrfunc_reason)\n @pytest.mark.parametrize('func', [\n lambda x: np.min_scalar_type(x),\ndiff --git a/dask/array/tests/test_reductions.py b/dask/array/tests/test_reductions.py\nindex bfc26ec9314..e767d69911a 100644\n--- a/dask/array/tests/test_reductions.py\n+++ b/dask/array/tests/test_reductions.py\n@@ -5,6 +5,8 @@\n import pytest\n np = pytest.importorskip('numpy')\n \n+import itertools\n+\n import dask.array as da\n from dask.array.utils import assert_eq as _assert_eq, same_keys\n from dask.core import get_deps\n@@ -15,6 +17,26 @@ def assert_eq(a, b):\n _assert_eq(a, b, equal_nan=True)\n \n \n+@pytest.mark.parametrize('dtype', ['f4', 'i4'])\n+@pytest.mark.parametrize('keepdims', [True, False])\n+def test_numel(dtype, keepdims):\n+ x = np.ones((2, 3, 4))\n+\n+ assert_eq(da.reductions.numel(x, axis=0, keepdims=keepdims, dtype=dtype),\n+ np.sum(x, axis=0, keepdims=keepdims, dtype=dtype))\n+\n+ for length in range(x.ndim):\n+ for sub in itertools.combinations([d for d in range(x.ndim)], length):\n+ assert_eq(da.reductions.numel(x, axis=sub, keepdims=keepdims, dtype=dtype),\n+ np.sum(x, axis=sub, keepdims=keepdims, dtype=dtype))\n+\n+ for length in range(x.ndim):\n+ for sub in itertools.combinations([d for d in range(x.ndim)], length):\n+ ssub = np.random.shuffle(list(sub))\n+ assert_eq(da.reductions.numel(x, axis=ssub, keepdims=keepdims, dtype=dtype),\n+ np.sum(x, axis=ssub, keepdims=keepdims, dtype=dtype))\n+\n+\n def reduction_1d_test(da_func, darr, np_func, narr, use_dtype=True, split_every=True):\n assert_eq(da_func(darr), np_func(narr))\n assert_eq(da_func(darr, keepdims=True), np_func(narr, keepdims=True))\ndiff --git a/dask/array/tests/test_sparse.py b/dask/array/tests/test_sparse.py\nindex 459609defab..4d565ffc45f 100644\n--- a/dask/array/tests/test_sparse.py\n+++ b/dask/array/tests/test_sparse.py\n@@ -33,6 +33,12 @@\n lambda x: x.T,\n lambda x: da.transpose(x, (1, 2, 0)),\n lambda x: x.sum(),\n+ lambda x: x.mean(),\n+ lambda x: x.moment(order=0),\n+ pytest.param(lambda x: x.std(),\n+ marks=pytest.mark.xfail(reason=\"fixed in https://github.com/pydata/sparse/pull/243\")),\n+ pytest.param(lambda x: x.var(),\n+ marks=pytest.mark.xfail(reason=\"fixed in https://github.com/pydata/sparse/pull/243\")),\n lambda x: x.dot(np.arange(x.shape[-1])),\n lambda x: x.dot(np.eye(x.shape[-1])),\n lambda x: da.tensordot(x, np.ones(x.shape[:2]), axes=[(0, 1), (0, 1)]),\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 4,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2390,"cells":{"instance_id":{"kind":"string","value":"dask__dask-7413@ec7bddd"},"repo":{"kind":"string","value":"dask/dask"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":7413,"string":"7,413"},"title":{"kind":"string","value":"Add config for handling obj normalization with missing __dask_tokenize__"},"body":{"kind":"string","value":"- [x] Closes #6555\r\n - [x] Added `tokenize.allow-random` config, accepting `True` or `False`.\r\n- [x] Tests added / passed\r\n - [x] Added `test_normalize_object` to `dask/tests/test_base.py`.\r\n- [x] Passes `black dask` / `flake8 dask`"},"created_at":{"kind":"string","value":"2021-03-17T14:05:12Z"},"problem_statement":{"kind":"string","value":"Flag for raising an error when `normalize_object` doesn't find `__dask_tokenize__`\nI ran into a bit of a nasty surprised when I realized some of my Delayed objects resulted in a different token when I called `tokenize()`. This is because in my data I had some objects which didn't have `__dask_tokenize__`. I fixed those errors, but I'm afraid they might come up again silently. It would be amazing if I could set a flag that would raise an error any time that I tried to tokenize something which contained anything that couldn't be tokenized deterministically. I'm thinking something in `dask.base.normalize_object` that raises an error instead of returning `uuid.uuid4().hex`.\r\n\r\nThanks!"},"hints_text":{"kind":"string","value":"Thanks for raising an issue @STOpandthink! I can imagine this was tedious to track down. Adding a config option to raise an error or warn when falling back to a random token (which is `False` by default) seems like a nice addition for certain use cases. Is this something you're interested in working on? (no obligation though)\nHi @jrbourbeau, could you please elaborate on the \"config option\" part?\r\nI suppose, based on the wording, you're referring to something other than a flag that's passed to a particular function or set of functions.\nDask has it's own [configuration system](https://docs.dask.org/en/latest/configuration.html) that let's user customize some of Dask's behavior (e.g. logging verbosity). The proposal here is to add a new configuration option that controls if users are informed when [`dask.base.normalize_object`](https://github.com/dask/dask/blob/1767fedd2f0662ba2fd6a9caebf2d3595ca8046c/dask/base.py#L838) isn't able to return a deterministic result and falls back to returning a [random `uuid`](https://github.com/dask/dask/blob/1767fedd2f0662ba2fd6a9caebf2d3595ca8046c/dask/base.py#L842)."},"resolved_issues":{"kind":"list like","value":[{"body":"I ran into a bit of a nasty surprised when I realized some of my Delayed objects resulted in a different token when I called `tokenize()`. This is because in my data I had some objects which didn't have `__dask_tokenize__`. I fixed those errors, but I'm afraid they might come up again silently. It would be amazing if I could set a flag that would raise an error any time that I tried to tokenize something which contained anything that couldn't be tokenized deterministically. I'm thinking something in `dask.base.normalize_object` that raises an error instead of returning `uuid.uuid4().hex`.\r\n\r\nThanks!","number":6555,"title":"Flag for raising an error when `normalize_object` doesn't find `__dask_tokenize__`"}],"string":"[\n {\n \"body\": \"I ran into a bit of a nasty surprised when I realized some of my Delayed objects resulted in a different token when I called `tokenize()`. This is because in my data I had some objects which didn't have `__dask_tokenize__`. I fixed those errors, but I'm afraid they might come up again silently. It would be amazing if I could set a flag that would raise an error any time that I tried to tokenize something which contained anything that couldn't be tokenized deterministically. I'm thinking something in `dask.base.normalize_object` that raises an error instead of returning `uuid.uuid4().hex`.\\r\\n\\r\\nThanks!\",\n \"number\": 6555,\n \"title\": \"Flag for raising an error when `normalize_object` doesn't find `__dask_tokenize__`\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"b888af46dd340f7573faef1dd9c2c8905820405d"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"ec7bddd3be307364d5771c36768f5bd54eb81461\",\n \"head_commit_message\": \"Add config for handling obj normalization with missing __dask_tokenize__ (#6555)\",\n \"patch_to_review\": \"diff --git a/dask/base.py b/dask/base.py\\nindex 1d5ad89b8bd..4ea837f451d 100644\\n--- a/dask/base.py\\n+++ b/dask/base.py\\n@@ -839,7 +839,42 @@ def normalize_object(o):\\n method = getattr(o, \\\"__dask_tokenize__\\\", None)\\n if method is not None:\\n return method()\\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\\n+\\n+ if callable(o):\\n+ return normalize_function(o)\\n+\\n+ handle_missing_dask_tokenize_method = config.get(\\n+ \\\"normalize_token.handle_missing_dask_tokenize_method\\\",\\n+ \\\"ignore\\\",\\n+ )\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"ignore\\\":\\n+ return uuid.uuid4().hex\\n+\\n+ missing_dask_tokenize_method_msg = (\\n+ f\\\"Object {str(o)} doesn't have a `__dask_tokenize__` method and \\\"\\n+ \\\"cannot be normalized deterministically.\\\"\\n+ )\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"warn\\\":\\n+ normalized = uuid.uuid4().hex\\n+\\n+ import warnings\\n+\\n+ warnings.warn(\\n+ missing_dask_tokenize_method_msg\\n+ + f' Normalizing non-deterministically to \\\"{normalized}\\\".'\\n+ )\\n+\\n+ return normalized\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"raise\\\":\\n+ raise TypeError(missing_dask_tokenize_method_msg)\\n+\\n+ raise ValueError(\\n+ f\\\"Invalid value for config `normalize_token.handle_missing_dask_tokenize_method`. \\\"\\n+ f'Expected one of [\\\"ignore\\\", \\\"warn\\\", \\\"raise\\\"]; got \\\"{handle_missing_dask_tokenize_method}\\\".'\\n+ )\\n \\n \\n function_cache = {}\\ndiff --git a/dask/tests/test_base.py b/dask/tests/test_base.py\\nindex f1681b41228..16d03e7e5d3 100644\\n--- a/dask/tests/test_base.py\\n+++ b/dask/tests/test_base.py\\n@@ -8,6 +8,8 @@\\n \\n from tlz import merge, partial, compose, curry\\n \\n+from unittest import mock\\n+\\n import dask\\n import dask.bag as db\\n from dask import delayed\\n@@ -224,6 +226,86 @@ def test_normalize_base():\\n assert normalize_token(i) is i\\n \\n \\n+def test_normalize_object():\\n+ import warnings\\n+\\n+ warnings.simplefilter(\\\"error\\\")\\n+\\n+ o = object()\\n+\\n+ # Baseline config behavior: no explicitly set config value.\\n+ # Default behavior is equivalent to \\\"ignore\\\", i.e., proceed with non-\\n+ # deterministic normalization.\\n+ with mock.patch(\\\"uuid.uuid4\\\") as mock_uuid4:\\n+ mock_uuid4.return_value = mock.Mock(hex=\\\"123\\\")\\n+ assert normalize_token(o) == \\\"123\\\"\\n+\\n+ # Explicitly set config value to \\\"ignore\\\".\\n+ with dask.config.set(\\n+ {\\\"normalize_token.handle_missing_dask_tokenize_method\\\": \\\"ignore\\\"}\\n+ ):\\n+ with mock.patch(\\\"uuid.uuid4\\\") as mock_uuid4:\\n+ mock_uuid4.return_value = mock.Mock(hex=\\\"123\\\")\\n+ assert normalize_token(o) == \\\"123\\\"\\n+\\n+ # Explicitly set config value to \\\"warn\\\".\\n+ with dask.config.set(\\n+ {\\\"normalize_token.handle_missing_dask_tokenize_method\\\": \\\"warn\\\"}\\n+ ):\\n+ with mock.patch(\\\"uuid.uuid4\\\") as mock_uuid4:\\n+ mock_uuid4.return_value = mock.Mock(hex=\\\"123\\\")\\n+\\n+ with pytest.raises(UserWarning) as excinfo:\\n+ assert normalize_token(o) == \\\"123\\\"\\n+\\n+ assert \\\"123\\\" in str(excinfo.value)\\n+\\n+ # Explicitly set config value to \\\"raise\\\".\\n+ with dask.config.set(\\n+ {\\\"normalize_token.handle_missing_dask_tokenize_method\\\": \\\"raise\\\"}\\n+ ):\\n+ with mock.patch(\\\"uuid.uuid4\\\") as mock_uuid4:\\n+ mock_uuid4.return_value = mock.Mock(hex=\\\"123\\\")\\n+\\n+ with pytest.raises(TypeError) as excinfo:\\n+ normalize_token(o)\\n+\\n+ assert \\\"__dask_tokenize__\\\" in str(excinfo.value)\\n+\\n+ # Explicitly set config value to some unsupported value.\\n+ with dask.config.set(\\n+ {\\\"normalize_token.handle_missing_dask_tokenize_method\\\": \\\"unsupported\\\"}\\n+ ):\\n+ with pytest.raises(ValueError) as excinfo:\\n+ normalize_token(o)\\n+\\n+ assert \\\"unsupported\\\" in str(excinfo.value)\\n+\\n+ # Assert that objects, which have a corresponding `__dask_tokenize__` are\\n+ # unaffected by the config, and get normalized as per that method.\\n+ o2 = mock.Mock()\\n+ o2.__dask_tokenize__ = mock.Mock(return_value=\\\"abc\\\")\\n+\\n+ for h in [\\\"ignore\\\", \\\"warn\\\", \\\"raise\\\"]:\\n+ with dask.config.set(\\n+ {\\\"normalize_token.handle_missing_dask_tokenize_method\\\": h}\\n+ ):\\n+ assert normalize_token(o2) == \\\"abc\\\"\\n+\\n+ # Assert that handling callables is unaffected by the config as it's logically distinct.\\n+ # Only one type of callables is tested here.\\n+ c = lambda: None\\n+\\n+ with mock.patch(\\\"cloudpickle.dumps\\\") as mock_cloudpickle_dumps:\\n+ mock_cloudpickle_dumps.return_value = \\\"678\\\"\\n+\\n+ for h in [\\\"ignore\\\", \\\"warn\\\", \\\"raise\\\"]:\\n+ with dask.config.set(\\n+ {\\\"normalize_token.handle_missing_dask_tokenize_method\\\": h}\\n+ ):\\n+ assert normalize_token(c) == \\\"678\\\"\\n+\\n+\\n @pytest.mark.skipif(\\\"not pd\\\")\\n def test_tokenize_pandas():\\n a = pd.DataFrame({\\\"x\\\": [1, 2, 3], \\\"y\\\": [\\\"4\\\", \\\"asd\\\", None]}, index=[1, 2, 3])\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -839,7 +839,42 @@ def normalize_object(o):\n method = getattr(o, \"__dask_tokenize__\", None)\n if method is not None:\n return method()\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\n+\n+ if callable(o):\n+ return normalize_function(o)\n+\n+ handle_missing_dask_tokenize_method = config.get(\n+ \"normalize_token.handle_missing_dask_tokenize_method\",\n+ \"ignore\",\n+ )\n+\n+ if handle_missing_dask_tokenize_method == \"ignore\":\n+ return uuid.uuid4().hex\n+\n+ missing_dask_tokenize_method_msg = (\n+ f\"Object {str(o)} doesn't have a `__dask_tokenize__` method and \"\n+ \"cannot be normalized deterministically.\"\n+ )\n+\n+ if handle_missing_dask_tokenize_method == \"warn\":\n+ normalized = uuid.uuid4().hex\n+\n+ import warnings\n+\n+ warnings.warn(","line":null,"original_line":864,"original_start_line":null,"path":"dask/base.py","start_line":null,"text":"@author:\nThis implicitly displays a `UserWarning`. Would a different type of warning be more suitable here (e.g., `RuntimeWarning`)?"},{"diff_hunk":"@@ -839,7 +839,42 @@ def normalize_object(o):\n method = getattr(o, \"__dask_tokenize__\", None)\n if method is not None:\n return method()\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\n+\n+ if callable(o):\n+ return normalize_function(o)\n+\n+ handle_missing_dask_tokenize_method = config.get(\n+ \"normalize_token.handle_missing_dask_tokenize_method\",\n+ \"ignore\",\n+ )\n+\n+ if handle_missing_dask_tokenize_method == \"ignore\":\n+ return uuid.uuid4().hex\n+\n+ missing_dask_tokenize_method_msg = (\n+ f\"Object {str(o)} doesn't have a `__dask_tokenize__` method and \"\n+ \"cannot be normalized deterministically.\"\n+ )\n+\n+ if handle_missing_dask_tokenize_method == \"warn\":\n+ normalized = uuid.uuid4().hex\n+\n+ import warnings\n+\n+ warnings.warn(\n+ missing_dask_tokenize_method_msg\n+ + f' Normalizing non-deterministically to \"{normalized}\".'\n+ )\n+\n+ return normalized\n+\n+ if handle_missing_dask_tokenize_method == \"raise\":\n+ raise TypeError(missing_dask_tokenize_method_msg)","line":null,"original_line":872,"original_start_line":null,"path":"dask/base.py","start_line":null,"text":"@author:\nI've opted for raising a `TypeError` here. Please, let me know if you believe some other type would be more suitable for this circumstance (e.g., `ValueError`)."}],"string":"[\n {\n \"diff_hunk\": \"@@ -839,7 +839,42 @@ def normalize_object(o):\\n method = getattr(o, \\\"__dask_tokenize__\\\", None)\\n if method is not None:\\n return method()\\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\\n+\\n+ if callable(o):\\n+ return normalize_function(o)\\n+\\n+ handle_missing_dask_tokenize_method = config.get(\\n+ \\\"normalize_token.handle_missing_dask_tokenize_method\\\",\\n+ \\\"ignore\\\",\\n+ )\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"ignore\\\":\\n+ return uuid.uuid4().hex\\n+\\n+ missing_dask_tokenize_method_msg = (\\n+ f\\\"Object {str(o)} doesn't have a `__dask_tokenize__` method and \\\"\\n+ \\\"cannot be normalized deterministically.\\\"\\n+ )\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"warn\\\":\\n+ normalized = uuid.uuid4().hex\\n+\\n+ import warnings\\n+\\n+ warnings.warn(\",\n \"line\": null,\n \"original_line\": 864,\n \"original_start_line\": null,\n \"path\": \"dask/base.py\",\n \"start_line\": null,\n \"text\": \"@author:\\nThis implicitly displays a `UserWarning`. Would a different type of warning be more suitable here (e.g., `RuntimeWarning`)?\"\n },\n {\n \"diff_hunk\": \"@@ -839,7 +839,42 @@ def normalize_object(o):\\n method = getattr(o, \\\"__dask_tokenize__\\\", None)\\n if method is not None:\\n return method()\\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\\n+\\n+ if callable(o):\\n+ return normalize_function(o)\\n+\\n+ handle_missing_dask_tokenize_method = config.get(\\n+ \\\"normalize_token.handle_missing_dask_tokenize_method\\\",\\n+ \\\"ignore\\\",\\n+ )\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"ignore\\\":\\n+ return uuid.uuid4().hex\\n+\\n+ missing_dask_tokenize_method_msg = (\\n+ f\\\"Object {str(o)} doesn't have a `__dask_tokenize__` method and \\\"\\n+ \\\"cannot be normalized deterministically.\\\"\\n+ )\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"warn\\\":\\n+ normalized = uuid.uuid4().hex\\n+\\n+ import warnings\\n+\\n+ warnings.warn(\\n+ missing_dask_tokenize_method_msg\\n+ + f' Normalizing non-deterministically to \\\"{normalized}\\\".'\\n+ )\\n+\\n+ return normalized\\n+\\n+ if handle_missing_dask_tokenize_method == \\\"raise\\\":\\n+ raise TypeError(missing_dask_tokenize_method_msg)\",\n \"line\": null,\n \"original_line\": 872,\n \"original_start_line\": null,\n \"path\": \"dask/base.py\",\n \"start_line\": null,\n \"text\": \"@author:\\nI've opted for raising a `TypeError` here. Please, let me know if you believe some other type would be more suitable for this circumstance (e.g., `ValueError`).\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"cb9d9d1b46414668792ec27e9ca46735214d5ee1"},"merged_patch":{"kind":"string","value":"diff --git a/dask/base.py b/dask/base.py\nindex a9368bfe8ea..8a9c100552a 100644\n--- a/dask/base.py\n+++ b/dask/base.py\n@@ -839,7 +839,14 @@ def func(seq):\n try:\n return list(map(normalize_token, seq))\n except RecursionError:\n- return str(uuid.uuid4())\n+ if not config.get(\"tokenize.ensure-deterministic\"):\n+ return uuid.uuid4().hex\n+\n+ raise RuntimeError(\n+ f\"Sequence {str(seq)} cannot be deterministically hashed. Please, see \"\n+ \"https://docs.dask.org/en/latest/custom-collections.html#implementing-deterministic-hashing \"\n+ \"for more information\"\n+ )\n \n return type(seq).__name__, func(seq)\n \n@@ -859,7 +866,18 @@ def normalize_object(o):\n method = getattr(o, \"__dask_tokenize__\", None)\n if method is not None:\n return method()\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\n+\n+ if callable(o):\n+ return normalize_function(o)\n+\n+ if not config.get(\"tokenize.ensure-deterministic\"):\n+ return uuid.uuid4().hex\n+\n+ raise RuntimeError(\n+ f\"Object {str(o)} cannot be deterministically hashed. Please, see \"\n+ \"https://docs.dask.org/en/latest/custom-collections.html#implementing-deterministic-hashing \"\n+ \"for more information\"\n+ )\n \n \n function_cache = {}\n@@ -1032,7 +1050,15 @@ def normalize_array(x):\n data = hash_buffer_hex(pickle.dumps(x, pickle.HIGHEST_PROTOCOL))\n except Exception:\n # pickling not supported, use UUID4-based fallback\n- data = uuid.uuid4().hex\n+ if not config.get(\"tokenize.ensure-deterministic\"):\n+ data = uuid.uuid4().hex\n+ else:\n+ raise RuntimeError(\n+ f\"``np.ndarray`` with object ``dtype`` {str(x)} cannot \"\n+ \"be deterministically hashed. Please, see \"\n+ \"https://docs.dask.org/en/latest/custom-collections.html#implementing-deterministic-hashing \" # noqa: E501\n+ \"for more information\"\n+ )\n else:\n try:\n data = hash_buffer_hex(x.ravel(order=\"K\").view(\"i1\"))\ndiff --git a/dask/dask-schema.yaml b/dask/dask-schema.yaml\nindex 4472ad2869b..ab747f199a2 100644\n--- a/dask/dask-schema.yaml\n+++ b/dask/dask-schema.yaml\n@@ -10,6 +10,17 @@ properties:\n When the value is \"null\" (default), dask will create a directory from\n where dask was launched: `cwd/dask-worker-space`\n \n+ tokenize:\n+ type: object\n+ properties:\n+ ensure-deterministic:\n+ type:\n+ - boolean\n+ description: |\n+ If ``true``, tokenize will error instead of falling back to uuids\n+ when a deterministic token cannot be generated. Defaults to\n+ ``false``.\n+\n dataframe:\n type: object\n properties:\ndiff --git a/dask/dask.yaml b/dask/dask.yaml\nindex dbdf158af08..3f5b4f365c8 100644\n--- a/dask/dask.yaml\n+++ b/dask/dask.yaml\n@@ -1,5 +1,8 @@\n temporary-directory: null # Directory for local disk like /tmp, /scratch, or /local\n \n+tokenize:\n+ ensure-deterministic: false # If true, tokenize will error instead of falling back to uuids\n+\n dataframe:\n shuffle-compression: null # compression for on disk-shuffling. Partd supports ZLib, BZ2, SNAPPY, BLOSC\n parquet:\ndiff --git a/dask/tests/test_base.py b/dask/tests/test_base.py\nindex 062d027e724..0698f758291 100644\n--- a/dask/tests/test_base.py\n+++ b/dask/tests/test_base.py\n@@ -128,9 +128,8 @@ def test_tokenize_numpy_scalar_string_rep():\n \n @pytest.mark.skipif(\"not np\")\n def test_tokenize_numpy_array_on_object_dtype():\n- assert tokenize(np.array([\"a\", \"aa\", \"aaa\"], dtype=object)) == tokenize(\n- np.array([\"a\", \"aa\", \"aaa\"], dtype=object)\n- )\n+ a = np.array([\"a\", \"aa\", \"aaa\"], dtype=object)\n+ assert tokenize(a) == tokenize(a)\n assert tokenize(np.array([\"a\", None, \"aaa\"], dtype=object)) == tokenize(\n np.array([\"a\", None, \"aaa\"], dtype=object)\n )\n@@ -138,6 +137,17 @@ def test_tokenize_numpy_array_on_object_dtype():\n np.array([(1, \"a\"), (1, None), (1, \"aaa\")], dtype=object)\n ) == tokenize(np.array([(1, \"a\"), (1, None), (1, \"aaa\")], dtype=object))\n \n+ # Trigger non-deterministic hashing for object dtype\n+ class NoPickle:\n+ pass\n+\n+ x = np.array([\"a\", None, NoPickle], dtype=object)\n+ assert tokenize(x) != tokenize(x)\n+\n+ with dask.config.set({\"tokenize.ensure-deterministic\": True}):\n+ with pytest.raises(RuntimeError, match=\"cannot be deterministically hashed\"):\n+ tokenize(x)\n+\n \n @pytest.mark.skipif(\"not np\")\n def test_tokenize_numpy_memmap_offset(tmpdir):\n@@ -226,6 +236,23 @@ def test_normalize_base():\n assert normalize_token(i) is i\n \n \n+def test_tokenize_object():\n+ o = object()\n+ # Defaults to non-deterministic tokenization\n+ assert normalize_token(o) != normalize_token(o)\n+\n+ with dask.config.set({\"tokenize.ensure-deterministic\": True}):\n+ with pytest.raises(RuntimeError, match=\"cannot be deterministically hashed\"):\n+ normalize_token(o)\n+\n+\n+def test_tokenize_callable():\n+ def my_func(a, b, c=1):\n+ return a + b + c\n+\n+ assert tokenize(my_func) == tokenize(my_func) # Consistent token\n+\n+\n @pytest.mark.skipif(\"not pd\")\n def test_tokenize_pandas():\n a = pd.DataFrame({\"x\": [1, 2, 3], \"y\": [\"4\", \"asd\", None]}, index=[1, 2, 3])\n@@ -335,6 +362,10 @@ def __dask_tokenize__(self):\n assert tokenize(a) == tokenize(a)\n assert tokenize(a) != tokenize(b)\n \n+ for ensure in [True, False]:\n+ with dask.config.set({\"tokenize.ensure-deterministic\": ensure}):\n+ assert tokenize(a) == tokenize(a)\n+\n # dispatch takes precedence\n before = tokenize(a)\n normalize_token.register(Foo, lambda self: self.x + 1)\n@@ -439,12 +470,16 @@ def test_tokenize_dense_sparse_array(cls_name):\n assert tokenize(a) != tokenize(b)\n \n \n-def test_tokenize_object_with_recursion_error_returns_uuid():\n+def test_tokenize_object_with_recursion_error():\n cycle = dict(a=None)\n cycle[\"a\"] = cycle\n \n assert len(tokenize(cycle)) == 32\n \n+ with dask.config.set({\"tokenize.ensure-deterministic\": True}):\n+ with pytest.raises(RuntimeError, match=\"cannot be deterministically hashed\"):\n+ tokenize(cycle)\n+\n \n def test_tokenize_datetime_date():\n # Same date\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2391,"cells":{"instance_id":{"kind":"string","value":"encode__httpx-351@8ae0126"},"repo":{"kind":"string","value":"encode/httpx"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":351,"string":"351"},"title":{"kind":"string","value":"Add `.elapsed` onto Response objects tracking how long a request took."},"body":{"kind":"string","value":"This should fix https://github.com/encode/httpx/issues/338\r\n\r\nExample:\r\n\r\n```python\r\nimport asyncio\r\n\r\nimport httpx\r\n\r\nasync def await_url(c):\r\n r = await c.get('http://httpbin.org/get')\r\n await r.read()\r\n print(r.elapsed)\r\n\r\nasync def httpx_test():\r\n client = httpx.AsyncClient()\r\n await asyncio.gather(*[await_url(client) for _ in range(25)])\r\n\r\nasyncio.run(httpx_test())\r\n```"},"created_at":{"kind":"string","value":"2019-09-17T00:49:06Z"},"problem_statement":{"kind":"string","value":"Missing requests' elapsed property on Response object. \nThe requests Response object has an elapsed property which returns a datetime.timedelta instance. This appears to be missing from the httpx Response.\r\n\r\nA nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspector (Blocked, DNS resolution, Connecting, TLS setup, Sending, Waiting and Receiving)."},"hints_text":{"kind":"string","value":"Yup, I remember I had identified this discrepency in https://github.com/encode/httpx/pull/298 already. I think it's a nice thing to have & one step further towards Requests compatibility. :)\r\n\r\n> A nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspector\r\n\r\nIt's a neat idea — though probably out of scope of the core package? We're working on providing an extension mechanism to the client though, and I think this could very well be a third-party tracing middleware of some kind.\nI can take a crack at this! This project looks super interesting and looking to get started."},"resolved_issues":{"kind":"list like","value":[{"body":"The requests Response object has an elapsed property which returns a datetime.timedelta instance. This appears to be missing from the httpx Response.\r\n\r\nA nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspector (Blocked, DNS resolution, Connecting, TLS setup, Sending, Waiting and Receiving).","number":338,"title":"Missing requests' elapsed property on Response object. "}],"string":"[\n {\n \"body\": \"The requests Response object has an elapsed property which returns a datetime.timedelta instance. This appears to be missing from the httpx Response.\\r\\n\\r\\nA nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspector (Blocked, DNS resolution, Connecting, TLS setup, Sending, Waiting and Receiving).\",\n \"number\": 338,\n \"title\": \"Missing requests' elapsed property on Response object. \"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"8155352d2028b7f74ccd53acdf5a8d74b84e6d15"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"8ae01264892a3413c32d7321095a8d15d03c1349\",\n \"head_commit_message\": \"Address feedback\",\n \"patch_to_review\": \"diff --git a/docs/api.md b/docs/api.md\\nindex 14cc4be9b5..83fe1e81cb 100644\\n--- a/docs/api.md\\n+++ b/docs/api.md\\n@@ -59,6 +59,11 @@\\n * `.request` - **Request**\\n * `.cookies` - **Cookies**\\n * `.history` - **List[Response]**\\n+* `.elapsed` - **[timedelta](https://docs.python.org/3/library/datetime.html)**\\n+ * The amount of time elapsed between sending the first byte and parsing the headers (not including time spent reading\\n+ the response). Use\\n+ [total_seconds()](https://docs.python.org/3/library/datetime.html#datetime.timedelta.total_seconds) to correctly get\\n+ the total elapsed seconds.\\n * `def .raise_for_status()` - **None**\\n * `def .json()` - **Any**\\n * `def .read()` - **bytes**\\ndiff --git a/httpx/client.py b/httpx/client.py\\nindex ea6dae6e17..090b405fb7 100644\\n--- a/httpx/client.py\\n+++ b/httpx/client.py\\n@@ -45,7 +45,7 @@\\n ResponseContent,\\n URLTypes,\\n )\\n-from .utils import get_netrc_login\\n+from .utils import ElapsedTimer, get_netrc_login\\n \\n \\n class BaseClient:\\n@@ -168,9 +168,11 @@ async def _get_response(\\n \\n async def get_response(request: AsyncRequest) -> AsyncResponse:\\n try:\\n- response = await self.dispatch.send(\\n- request, verify=verify, cert=cert, timeout=timeout\\n- )\\n+ with ElapsedTimer() as timer:\\n+ response = await self.dispatch.send(\\n+ request, verify=verify, cert=cert, timeout=timeout\\n+ )\\n+ response.elapsed = timer.elapsed\\n except HTTPError as exc:\\n # Add the original request to any HTTPError\\n exc.request = request\\n@@ -707,6 +709,7 @@ def sync_on_close() -> None:\\n on_close=sync_on_close,\\n request=async_response.request,\\n history=async_response.history,\\n+ elapsed=async_response.elapsed,\\n )\\n if not stream:\\n try:\\ndiff --git a/httpx/models.py b/httpx/models.py\\nindex e60453bd72..126dc578cb 100644\\n--- a/httpx/models.py\\n+++ b/httpx/models.py\\n@@ -1,4 +1,5 @@\\n import cgi\\n+import datetime\\n import email.message\\n import json as jsonlib\\n import typing\\n@@ -717,6 +718,7 @@ def __init__(\\n headers: HeaderTypes = None,\\n request: BaseRequest = None,\\n on_close: typing.Callable = None,\\n+ elapsed: datetime.timedelta = None,\\n ):\\n self.status_code = status_code\\n self.http_version = http_version\\n@@ -724,6 +726,7 @@ def __init__(\\n \\n self.request = request\\n self.on_close = on_close\\n+ self.elapsed = datetime.timedelta(0) if elapsed is None else elapsed\\n self.call_next: typing.Optional[typing.Callable] = None\\n \\n @property\\n@@ -901,6 +904,7 @@ def __init__(\\n on_close: typing.Callable = None,\\n request: AsyncRequest = None,\\n history: typing.List[\\\"BaseResponse\\\"] = None,\\n+ elapsed: datetime.timedelta = None,\\n ):\\n super().__init__(\\n status_code=status_code,\\n@@ -908,6 +912,7 @@ def __init__(\\n headers=headers,\\n request=request,\\n on_close=on_close,\\n+ elapsed=elapsed,\\n )\\n \\n self.history = [] if history is None else list(history)\\n@@ -1000,6 +1005,7 @@ def __init__(\\n on_close: typing.Callable = None,\\n request: Request = None,\\n history: typing.List[\\\"BaseResponse\\\"] = None,\\n+ elapsed: datetime.timedelta = None,\\n ):\\n super().__init__(\\n status_code=status_code,\\n@@ -1007,6 +1013,7 @@ def __init__(\\n headers=headers,\\n request=request,\\n on_close=on_close,\\n+ elapsed=elapsed,\\n )\\n \\n self.history = [] if history is None else list(history)\\ndiff --git a/httpx/utils.py b/httpx/utils.py\\nindex f6b83c89db..b2bb96c745 100644\\n--- a/httpx/utils.py\\n+++ b/httpx/utils.py\\n@@ -5,7 +5,10 @@\\n import re\\n import sys\\n import typing\\n+from datetime import timedelta\\n from pathlib import Path\\n+from time import perf_counter\\n+from types import TracebackType\\n \\n \\n def normalize_header_key(value: typing.AnyStr, encoding: str = None) -> bytes:\\n@@ -183,3 +186,27 @@ def to_str(str_or_bytes: typing.Union[str, bytes], encoding: str = \\\"utf-8\\\") -> s\\n \\n def unquote(value: str) -> str:\\n return value[1:-1] if value[0] == value[-1] == '\\\"' else value\\n+\\n+\\n+class ElapsedTimer:\\n+ def __init__(self) -> None:\\n+ self.start: float = perf_counter()\\n+ self.end: typing.Optional[float] = None\\n+\\n+ def __enter__(self) -> \\\"ElapsedTimer\\\":\\n+ self.start = perf_counter()\\n+ return self\\n+\\n+ def __exit__(\\n+ self,\\n+ exc_type: typing.Type[BaseException] = None,\\n+ exc_value: BaseException = None,\\n+ traceback: TracebackType = None,\\n+ ) -> None:\\n+ self.end = perf_counter()\\n+\\n+ @property\\n+ def elapsed(self) -> timedelta:\\n+ if self.end is None:\\n+ return timedelta(seconds=perf_counter() - self.start)\\n+ return timedelta(seconds=self.end - self.start)\\ndiff --git a/tests/client/test_async_client.py b/tests/client/test_async_client.py\\nindex 472b013bdf..37f0390f7a 100644\\n--- a/tests/client/test_async_client.py\\n+++ b/tests/client/test_async_client.py\\n@@ -1,3 +1,5 @@\\n+from datetime import timedelta\\n+\\n import pytest\\n \\n import httpx\\n@@ -12,6 +14,7 @@ async def test_get(server, backend):\\n assert response.http_version == \\\"HTTP/1.1\\\"\\n assert response.headers\\n assert repr(response) == \\\"<Response [200 OK]>\\\"\\n+ assert response.elapsed > timedelta(seconds=0)\\n \\n \\n async def test_build_request(server, backend):\\ndiff --git a/tests/client/test_client.py b/tests/client/test_client.py\\nindex 90e47ee3ad..9183692198 100644\\n--- a/tests/client/test_client.py\\n+++ b/tests/client/test_client.py\\n@@ -1,3 +1,6 @@\\n+from datetime import timedelta\\n+from time import sleep\\n+\\n import pytest\\n \\n import httpx\\n@@ -17,6 +20,7 @@ def test_get(server):\\n assert response.headers\\n assert response.is_redirect is False\\n assert repr(response) == \\\"<Response [200 OK]>\\\"\\n+ assert response.elapsed > timedelta(0)\\n \\n \\n def test_build_request(server):\\n@@ -156,3 +160,17 @@ def test_client_backend_must_be_asyncio_based():\\n \\n with pytest.raises(ValueError):\\n httpx.Client(backend=AnyBackend())\\n+\\n+\\n+def test_elapsed_delay(server):\\n+ with httpx.Client() as http:\\n+ response = http.get(server.url.copy_with(path=\\\"/slow_response/100\\\"))\\n+ assert response.elapsed.total_seconds() == pytest.approx(0.1, abs=0.01)\\n+\\n+\\n+def test_elapsed_delay_ignores_read_time(server):\\n+ with httpx.Client() as http:\\n+ response = http.get(server.url.copy_with(path=\\\"/slow_response/50\\\"), stream=True)\\n+ sleep(0.1)\\n+ response.read()\\n+ assert response.elapsed.total_seconds() == pytest.approx(0.05, abs=0.01)\\ndiff --git a/tests/conftest.py b/tests/conftest.py\\nindex 71f3007c21..c7ca24bdd6 100644\\n--- a/tests/conftest.py\\n+++ b/tests/conftest.py\\n@@ -53,7 +53,7 @@ def backend(request):\\n \\n async def app(scope, receive, send):\\n assert scope[\\\"type\\\"] == \\\"http\\\"\\n- if scope[\\\"path\\\"] == \\\"/slow_response\\\":\\n+ if scope[\\\"path\\\"].startswith(\\\"/slow_response\\\"):\\n await slow_response(scope, receive, send)\\n elif scope[\\\"path\\\"].startswith(\\\"/status\\\"):\\n await status_code(scope, receive, send)\\n@@ -77,7 +77,12 @@ async def hello_world(scope, receive, send):\\n \\n \\n async def slow_response(scope, receive, send):\\n- await asyncio.sleep(0.1)\\n+ delay_ms_str: str = scope[\\\"path\\\"].replace(\\\"/slow_response/\\\", \\\"\\\")\\n+ try:\\n+ delay_ms = float(delay_ms_str)\\n+ except ValueError:\\n+ delay_ms = 100\\n+ await asyncio.sleep(delay_ms / 1000.0)\\n await send(\\n {\\n \\\"type\\\": \\\"http.response.start\\\",\\ndiff --git a/tests/models/test_responses.py b/tests/models/test_responses.py\\nindex 25a19353df..6467e5ca60 100644\\n--- a/tests/models/test_responses.py\\n+++ b/tests/models/test_responses.py\\n@@ -1,3 +1,4 @@\\n+import datetime\\n import json\\n from unittest import mock\\n \\n@@ -21,6 +22,7 @@ def test_response():\\n assert response.status_code == 200\\n assert response.reason_phrase == \\\"OK\\\"\\n assert response.text == \\\"Hello, world!\\\"\\n+ assert response.elapsed == datetime.timedelta(0)\\n \\n \\n def test_response_repr():\\ndiff --git a/tests/test_api.py b/tests/test_api.py\\nindex 1500869eb0..359bb735a1 100644\\n--- a/tests/test_api.py\\n+++ b/tests/test_api.py\\n@@ -12,7 +12,7 @@ def test_get(server):\\n \\n \\n def test_post(server):\\n- response = httpx.post(server.url, data=b\\\"Hello, world!\\\")\\n+ response = httpx.post(server.url, data=b\\\" Hello, world!\\\")\\n assert response.status_code == 200\\n assert response.reason_phrase == \\\"OK\\\"\\n \\ndiff --git a/tests/test_utils.py b/tests/test_utils.py\\nindex d3dad731f2..9b28a6ff31 100644\\n--- a/tests/test_utils.py\\n+++ b/tests/test_utils.py\\n@@ -1,3 +1,4 @@\\n+import asyncio\\n import logging\\n import os\\n \\n@@ -5,7 +6,12 @@\\n \\n import httpx\\n from httpx import utils\\n-from httpx.utils import get_netrc_login, guess_json_utf, parse_header_links\\n+from httpx.utils import (\\n+ ElapsedTimer,\\n+ get_netrc_login,\\n+ guess_json_utf,\\n+ parse_header_links,\\n+)\\n \\n \\n @pytest.mark.parametrize(\\n@@ -111,3 +117,14 @@ async def test_httpx_debug_enabled_stderr_logging(server, capsys, httpx_debug):\\n \\n # Reset the logger so we don't have verbose output in all unit tests\\n logging.getLogger(\\\"httpx\\\").handlers = []\\n+\\n+\\n+@pytest.mark.asyncio\\n+async def test_elapsed_timer():\\n+ with ElapsedTimer() as timer:\\n+ assert timer.elapsed.total_seconds() == pytest.approx(0, abs=0.05)\\n+ await asyncio.sleep(0.1)\\n+ await asyncio.sleep(\\n+ 0.1\\n+ ) # test to ensure time spent after timer exits isn't accounted for.\\n+ assert timer.elapsed.total_seconds() == pytest.approx(0.1, abs=0.05)\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -12,7 +12,7 @@ def test_get(server):\n \n \n def test_post(server):\n- response = httpx.post(server.url, data=b\"Hello, world!\")\n+ response = httpx.post(server.url, data=b\" Hello, world!\")","line":null,"original_line":15,"original_start_line":null,"path":"tests/test_api.py","start_line":null,"text":"@user1:\nOops!\r\n\r\n```suggestion\r\n response = httpx.post(server.url, data=b\"Hello, world!\")\r\n```"}],"string":"[\n {\n \"diff_hunk\": \"@@ -12,7 +12,7 @@ def test_get(server):\\n \\n \\n def test_post(server):\\n- response = httpx.post(server.url, data=b\\\"Hello, world!\\\")\\n+ response = httpx.post(server.url, data=b\\\" Hello, world!\\\")\",\n \"line\": null,\n \"original_line\": 15,\n \"original_start_line\": null,\n \"path\": \"tests/test_api.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nOops!\\r\\n\\r\\n```suggestion\\r\\n response = httpx.post(server.url, data=b\\\"Hello, world!\\\")\\r\\n```\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"50177eae6c67acd50455659b486e58c919c03b54"},"merged_patch":{"kind":"string","value":"diff --git a/docs/api.md b/docs/api.md\nindex 14cc4be9b5..83fe1e81cb 100644\n--- a/docs/api.md\n+++ b/docs/api.md\n@@ -59,6 +59,11 @@\n * `.request` - **Request**\n * `.cookies` - **Cookies**\n * `.history` - **List[Response]**\n+* `.elapsed` - **[timedelta](https://docs.python.org/3/library/datetime.html)**\n+ * The amount of time elapsed between sending the first byte and parsing the headers (not including time spent reading\n+ the response). Use\n+ [total_seconds()](https://docs.python.org/3/library/datetime.html#datetime.timedelta.total_seconds) to correctly get\n+ the total elapsed seconds.\n * `def .raise_for_status()` - **None**\n * `def .json()` - **Any**\n * `def .read()` - **bytes**\ndiff --git a/httpx/client.py b/httpx/client.py\nindex ea6dae6e17..090b405fb7 100644\n--- a/httpx/client.py\n+++ b/httpx/client.py\n@@ -45,7 +45,7 @@\n ResponseContent,\n URLTypes,\n )\n-from .utils import get_netrc_login\n+from .utils import ElapsedTimer, get_netrc_login\n \n \n class BaseClient:\n@@ -168,9 +168,11 @@ async def _get_response(\n \n async def get_response(request: AsyncRequest) -> AsyncResponse:\n try:\n- response = await self.dispatch.send(\n- request, verify=verify, cert=cert, timeout=timeout\n- )\n+ with ElapsedTimer() as timer:\n+ response = await self.dispatch.send(\n+ request, verify=verify, cert=cert, timeout=timeout\n+ )\n+ response.elapsed = timer.elapsed\n except HTTPError as exc:\n # Add the original request to any HTTPError\n exc.request = request\n@@ -707,6 +709,7 @@ def sync_on_close() -> None:\n on_close=sync_on_close,\n request=async_response.request,\n history=async_response.history,\n+ elapsed=async_response.elapsed,\n )\n if not stream:\n try:\ndiff --git a/httpx/models.py b/httpx/models.py\nindex e60453bd72..126dc578cb 100644\n--- a/httpx/models.py\n+++ b/httpx/models.py\n@@ -1,4 +1,5 @@\n import cgi\n+import datetime\n import email.message\n import json as jsonlib\n import typing\n@@ -717,6 +718,7 @@ def __init__(\n headers: HeaderTypes = None,\n request: BaseRequest = None,\n on_close: typing.Callable = None,\n+ elapsed: datetime.timedelta = None,\n ):\n self.status_code = status_code\n self.http_version = http_version\n@@ -724,6 +726,7 @@ def __init__(\n \n self.request = request\n self.on_close = on_close\n+ self.elapsed = datetime.timedelta(0) if elapsed is None else elapsed\n self.call_next: typing.Optional[typing.Callable] = None\n \n @property\n@@ -901,6 +904,7 @@ def __init__(\n on_close: typing.Callable = None,\n request: AsyncRequest = None,\n history: typing.List[\"BaseResponse\"] = None,\n+ elapsed: datetime.timedelta = None,\n ):\n super().__init__(\n status_code=status_code,\n@@ -908,6 +912,7 @@ def __init__(\n headers=headers,\n request=request,\n on_close=on_close,\n+ elapsed=elapsed,\n )\n \n self.history = [] if history is None else list(history)\n@@ -1000,6 +1005,7 @@ def __init__(\n on_close: typing.Callable = None,\n request: Request = None,\n history: typing.List[\"BaseResponse\"] = None,\n+ elapsed: datetime.timedelta = None,\n ):\n super().__init__(\n status_code=status_code,\n@@ -1007,6 +1013,7 @@ def __init__(\n headers=headers,\n request=request,\n on_close=on_close,\n+ elapsed=elapsed,\n )\n \n self.history = [] if history is None else list(history)\ndiff --git a/httpx/utils.py b/httpx/utils.py\nindex f6b83c89db..b2bb96c745 100644\n--- a/httpx/utils.py\n+++ b/httpx/utils.py\n@@ -5,7 +5,10 @@\n import re\n import sys\n import typing\n+from datetime import timedelta\n from pathlib import Path\n+from time import perf_counter\n+from types import TracebackType\n \n \n def normalize_header_key(value: typing.AnyStr, encoding: str = None) -> bytes:\n@@ -183,3 +186,27 @@ def to_str(str_or_bytes: typing.Union[str, bytes], encoding: str = \"utf-8\") -> s\n \n def unquote(value: str) -> str:\n return value[1:-1] if value[0] == value[-1] == '\"' else value\n+\n+\n+class ElapsedTimer:\n+ def __init__(self) -> None:\n+ self.start: float = perf_counter()\n+ self.end: typing.Optional[float] = None\n+\n+ def __enter__(self) -> \"ElapsedTimer\":\n+ self.start = perf_counter()\n+ return self\n+\n+ def __exit__(\n+ self,\n+ exc_type: typing.Type[BaseException] = None,\n+ exc_value: BaseException = None,\n+ traceback: TracebackType = None,\n+ ) -> None:\n+ self.end = perf_counter()\n+\n+ @property\n+ def elapsed(self) -> timedelta:\n+ if self.end is None:\n+ return timedelta(seconds=perf_counter() - self.start)\n+ return timedelta(seconds=self.end - self.start)\ndiff --git a/tests/client/test_async_client.py b/tests/client/test_async_client.py\nindex 472b013bdf..37f0390f7a 100644\n--- a/tests/client/test_async_client.py\n+++ b/tests/client/test_async_client.py\n@@ -1,3 +1,5 @@\n+from datetime import timedelta\n+\n import pytest\n \n import httpx\n@@ -12,6 +14,7 @@ async def test_get(server, backend):\n assert response.http_version == \"HTTP/1.1\"\n assert response.headers\n assert repr(response) == \"<Response [200 OK]>\"\n+ assert response.elapsed > timedelta(seconds=0)\n \n \n async def test_build_request(server, backend):\ndiff --git a/tests/client/test_client.py b/tests/client/test_client.py\nindex 90e47ee3ad..9183692198 100644\n--- a/tests/client/test_client.py\n+++ b/tests/client/test_client.py\n@@ -1,3 +1,6 @@\n+from datetime import timedelta\n+from time import sleep\n+\n import pytest\n \n import httpx\n@@ -17,6 +20,7 @@ def test_get(server):\n assert response.headers\n assert response.is_redirect is False\n assert repr(response) == \"<Response [200 OK]>\"\n+ assert response.elapsed > timedelta(0)\n \n \n def test_build_request(server):\n@@ -156,3 +160,17 @@ def test_client_backend_must_be_asyncio_based():\n \n with pytest.raises(ValueError):\n httpx.Client(backend=AnyBackend())\n+\n+\n+def test_elapsed_delay(server):\n+ with httpx.Client() as http:\n+ response = http.get(server.url.copy_with(path=\"/slow_response/100\"))\n+ assert response.elapsed.total_seconds() == pytest.approx(0.1, abs=0.01)\n+\n+\n+def test_elapsed_delay_ignores_read_time(server):\n+ with httpx.Client() as http:\n+ response = http.get(server.url.copy_with(path=\"/slow_response/50\"), stream=True)\n+ sleep(0.1)\n+ response.read()\n+ assert response.elapsed.total_seconds() == pytest.approx(0.05, abs=0.01)\ndiff --git a/tests/conftest.py b/tests/conftest.py\nindex 71f3007c21..c7ca24bdd6 100644\n--- a/tests/conftest.py\n+++ b/tests/conftest.py\n@@ -53,7 +53,7 @@ def backend(request):\n \n async def app(scope, receive, send):\n assert scope[\"type\"] == \"http\"\n- if scope[\"path\"] == \"/slow_response\":\n+ if scope[\"path\"].startswith(\"/slow_response\"):\n await slow_response(scope, receive, send)\n elif scope[\"path\"].startswith(\"/status\"):\n await status_code(scope, receive, send)\n@@ -77,7 +77,12 @@ async def hello_world(scope, receive, send):\n \n \n async def slow_response(scope, receive, send):\n- await asyncio.sleep(0.1)\n+ delay_ms_str: str = scope[\"path\"].replace(\"/slow_response/\", \"\")\n+ try:\n+ delay_ms = float(delay_ms_str)\n+ except ValueError:\n+ delay_ms = 100\n+ await asyncio.sleep(delay_ms / 1000.0)\n await send(\n {\n \"type\": \"http.response.start\",\ndiff --git a/tests/models/test_responses.py b/tests/models/test_responses.py\nindex 25a19353df..6467e5ca60 100644\n--- a/tests/models/test_responses.py\n+++ b/tests/models/test_responses.py\n@@ -1,3 +1,4 @@\n+import datetime\n import json\n from unittest import mock\n \n@@ -21,6 +22,7 @@ def test_response():\n assert response.status_code == 200\n assert response.reason_phrase == \"OK\"\n assert response.text == \"Hello, world!\"\n+ assert response.elapsed == datetime.timedelta(0)\n \n \n def test_response_repr():\ndiff --git a/tests/test_utils.py b/tests/test_utils.py\nindex d3dad731f2..9b28a6ff31 100644\n--- a/tests/test_utils.py\n+++ b/tests/test_utils.py\n@@ -1,3 +1,4 @@\n+import asyncio\n import logging\n import os\n \n@@ -5,7 +6,12 @@\n \n import httpx\n from httpx import utils\n-from httpx.utils import get_netrc_login, guess_json_utf, parse_header_links\n+from httpx.utils import (\n+ ElapsedTimer,\n+ get_netrc_login,\n+ guess_json_utf,\n+ parse_header_links,\n+)\n \n \n @pytest.mark.parametrize(\n@@ -111,3 +117,14 @@ async def test_httpx_debug_enabled_stderr_logging(server, capsys, httpx_debug):\n \n # Reset the logger so we don't have verbose output in all unit tests\n logging.getLogger(\"httpx\").handlers = []\n+\n+\n+@pytest.mark.asyncio\n+async def test_elapsed_timer():\n+ with ElapsedTimer() as timer:\n+ assert timer.elapsed.total_seconds() == pytest.approx(0, abs=0.05)\n+ await asyncio.sleep(0.1)\n+ await asyncio.sleep(\n+ 0.1\n+ ) # test to ensure time spent after timer exits isn't accounted for.\n+ assert timer.elapsed.total_seconds() == pytest.approx(0.1, abs=0.05)\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2392,"cells":{"instance_id":{"kind":"string","value":"certbot__certbot-7837@2b55229"},"repo":{"kind":"string","value":"certbot/certbot"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":7837,"string":"7,837"},"title":{"kind":"string","value":"Exposes environment variable to let hooks scripts know when the last challenge is handled"},"body":{"kind":"string","value":"Fixes #5484 \r\n\r\nThis PRs makes Certbot expose two new environment variables in the auth and cleanup hooks of the `manual` plugin:\r\n* `CERTBOT_REMAINING_CHALLENGES` contains the number of challenges that remain after the current one (so it equals to 0 when the script is called for the last challenge)\r\n* `CERTBOT_ALL_DOMAINS` contains a comma-separated list of all domains concerned by a challenge for the current certificate\r\n\r\nWith these variables, an hook script can know when it is run for the last time, and then trigger appropriate finalizers for all challenges that have been executed. This will be particularly useful for certificates with a lot of domains validated with DNS-01 challenges: instead of waiting on each hook execution to check that the relevant DNS TXT entry has been inserted, these waits can be avoided thanks to the latest hook verifying all domains in one run."},"created_at":{"kind":"string","value":"2020-03-04T23:52:44Z"},"problem_statement":{"kind":"string","value":"Feature request: Add option to know what is the last domain passed to dns hook script\nHi,\r\n\r\ncertbot doesn't provide an official hook to work with the API of my DNS provider so I'm using my own script. Well, we know every time we create/modify a record on our DNS provider it needs to propagate to all the authoritative DNS servers, in my case it takes 1 minute and 30 seconds approx., right now, as far as I know, there is no option to know what is the last domain that is being issued so to be bullet proof, every time the script creates the _acme_challenge TXT record, I wait 1:30 minutes, well I use the API to know when the propagation is finished but as I said, it takes 1:30 minutes. If I want to issue a certificate with 100 domains it will take approx. 2 hours and 30 minutes to complete the request. If I had a way to know what is the last domain I could write all the TXT records and when the last domain is created, I could add the check to know when the propagation has finished (or just a simple sleep...) so it takes only 1:30 minutes instead of 2 hours and 30 minutes.\r\n\r\nIt would be great if certbot provided a variable like `CERTBOT_LAST_DOMAIN=true` or something like that so the script could have the logic to sleep the right amount of time to let finish the DNS propagation or to perform the needed checks only when there are no more domains to add to our DNS provider.\r\n\r\nAs a workaround I pass the last domain to my script:\r\n\r\n`./certbot-auto certonly --manual --preferred-challenges=dns --manual-auth-hook \"/path/to/hook/dnsapi.sh yyy.domain.tld\" --manual-cleanup-hook /path/to/hook/dnsapi-cleanup.sh -d zzz.domain.tld,aaa.domain.tld,yyy.domain.tld`\r\n\r\nand it works perfectly but would be great to have this feature added directly to certbot.\r\n\r\nThank you in advance.\r\n\r\nCheers,\r\nsahsanu"},"hints_text":{"kind":"string","value":"Sounds like a question for @bmw\nWe're currently rethinking a bit about how our plugins work, but if we don't end up making major changes there, I think can and should do something like this.\nThat sounds good, we'll appreciate it.\n\nThank you very much. \n\n-----Original Message-----\nFrom: Brad Warren <notifications@github.com>\nTo: certbot/certbot <certbot@noreply.github.com>\nCc: sahsanu <raul@sahsanu.com>, Author <author@noreply.github.com>\nSent: jue., 18 abr. 2019 20:43\nSubject: Re: [certbot/certbot] Feature request: Add option to know what is the last domain passed to dns hook script (#5484)\n\nWe're currently rethinking a bit about how our plugins work, but if we don't end up making major changes there, I think can and should do something like this.\n\n-- \nYou are receiving this because you authored the thread.\nReply to this email directly or view it on GitHub:\nhttps://github.com/certbot/certbot/issues/5484#issuecomment-484635238\nWe'd accept a PR for this which adds an environment variable like `CERTBOT_REMAINING_CHALLENGES` that is set for both `--manual-auth-hook` and `--manual-cleanup-hook`. The value would be the number of additional times Certbot will call the hook for the current certificate. When the hook is called for the last challenge, `CERTBOT_REMAINING_CHALLENGES` would be 0.\r\n\r\nThis was discussed in https://github.com/certbot/certbot/pull/6607.\n@bmw @sahsanu I would love `CERTBOT_REMAINING_CHALLENGES`, this would speed up cert generation for us. Currently with manual-auth-hook for 28 subdomain wildcard SAN, 1 root domain wildcard SAN, 1 root domain, we are at 45 - 50 mins to generate a cert.\r\n\r\nA implementation like this will greatly help us. Can you please consider opening this issue?\r\n\r\nhttps://community.letsencrypt.org/t/parallel-run-of-certbot-manual-auth-hook-manual-cleanup-hook-for-validation-of-multidomain-cert/115352\n@sahsanu in the meantime you can slightly improve the time it takes for resolution with a similar implementation, based on your DNS provider, this might be helpful or not.\r\n\r\n```\r\ntimeout 120 sh << EOF\r\nNAME_SERVERS=\"$(dig +short -t NS ${DOMAIN} | tr '\\n' ' ')\"\r\necho \"NAME_SERVERS=\\${NAME_SERVERS}\"\r\nfor NS in \\$NAME_SERVERS; do\r\n echo \"NS=\\${NS}\"\r\n until dig +short -t TXT ${ACME_CHALLENGE_DOMAIN} @\\${NS} | grep -q -- \"${CERTBOT_VALIDATION}\"; do\r\n echo \"$(date -Is) waiting for DNS resolution of ${ACME_CHALLENGE_DOMAIN} to show ${CERTBOT_VALIDATION} on \\${NS}\"\r\n sleep 1\r\n done\r\n echo \"resolved on \\${NS}\"\r\ndone\r\necho \"resolved on all name servers: \\${NAME_SERVERS}\"\r\nEOF\r\n\r\necho \"$(date -Is) sleeping for 15s for DNS propogation.\"\r\nsleep 15\r\n```"},"resolved_issues":{"kind":"list like","value":[{"body":"Hi,\r\n\r\ncertbot doesn't provide an official hook to work with the API of my DNS provider so I'm using my own script. Well, we know every time we create/modify a record on our DNS provider it needs to propagate to all the authoritative DNS servers, in my case it takes 1 minute and 30 seconds approx., right now, as far as I know, there is no option to know what is the last domain that is being issued so to be bullet proof, every time the script creates the _acme_challenge TXT record, I wait 1:30 minutes, well I use the API to know when the propagation is finished but as I said, it takes 1:30 minutes. If I want to issue a certificate with 100 domains it will take approx. 2 hours and 30 minutes to complete the request. If I had a way to know what is the last domain I could write all the TXT records and when the last domain is created, I could add the check to know when the propagation has finished (or just a simple sleep...) so it takes only 1:30 minutes instead of 2 hours and 30 minutes.\r\n\r\nIt would be great if certbot provided a variable like `CERTBOT_LAST_DOMAIN=true` or something like that so the script could have the logic to sleep the right amount of time to let finish the DNS propagation or to perform the needed checks only when there are no more domains to add to our DNS provider.\r\n\r\nAs a workaround I pass the last domain to my script:\r\n\r\n`./certbot-auto certonly --manual --preferred-challenges=dns --manual-auth-hook \"/path/to/hook/dnsapi.sh yyy.domain.tld\" --manual-cleanup-hook /path/to/hook/dnsapi-cleanup.sh -d zzz.domain.tld,aaa.domain.tld,yyy.domain.tld`\r\n\r\nand it works perfectly but would be great to have this feature added directly to certbot.\r\n\r\nThank you in advance.\r\n\r\nCheers,\r\nsahsanu","number":5484,"title":"Feature request: Add option to know what is the last domain passed to dns hook script"}],"string":"[\n {\n \"body\": \"Hi,\\r\\n\\r\\ncertbot doesn't provide an official hook to work with the API of my DNS provider so I'm using my own script. Well, we know every time we create/modify a record on our DNS provider it needs to propagate to all the authoritative DNS servers, in my case it takes 1 minute and 30 seconds approx., right now, as far as I know, there is no option to know what is the last domain that is being issued so to be bullet proof, every time the script creates the _acme_challenge TXT record, I wait 1:30 minutes, well I use the API to know when the propagation is finished but as I said, it takes 1:30 minutes. If I want to issue a certificate with 100 domains it will take approx. 2 hours and 30 minutes to complete the request. If I had a way to know what is the last domain I could write all the TXT records and when the last domain is created, I could add the check to know when the propagation has finished (or just a simple sleep...) so it takes only 1:30 minutes instead of 2 hours and 30 minutes.\\r\\n\\r\\nIt would be great if certbot provided a variable like `CERTBOT_LAST_DOMAIN=true` or something like that so the script could have the logic to sleep the right amount of time to let finish the DNS propagation or to perform the needed checks only when there are no more domains to add to our DNS provider.\\r\\n\\r\\nAs a workaround I pass the last domain to my script:\\r\\n\\r\\n`./certbot-auto certonly --manual --preferred-challenges=dns --manual-auth-hook \\\"/path/to/hook/dnsapi.sh yyy.domain.tld\\\" --manual-cleanup-hook /path/to/hook/dnsapi-cleanup.sh -d zzz.domain.tld,aaa.domain.tld,yyy.domain.tld`\\r\\n\\r\\nand it works perfectly but would be great to have this feature added directly to certbot.\\r\\n\\r\\nThank you in advance.\\r\\n\\r\\nCheers,\\r\\nsahsanu\",\n \"number\": 5484,\n \"title\": \"Feature request: Add option to know what is the last domain passed to dns hook script\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"7f63141e410ae7ce200c7c7408d05c87eae0c5f5"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"2b5522978597776e3970f367c1a0eaa0b13e1c94\",\n \"head_commit_message\": \"Less variables and less lines\",\n \"patch_to_review\": \"diff --git a/certbot/certbot/_internal/plugins/manual.py b/certbot/certbot/_internal/plugins/manual.py\\nindex 3204fe1dab2..1804e7d7e49 100644\\n--- a/certbot/certbot/_internal/plugins/manual.py\\n+++ b/certbot/certbot/_internal/plugins/manual.py\\n@@ -109,14 +109,13 @@ def get_chall_pref(self, domain):\\n \\n def perform(self, achalls): # pylint: disable=missing-function-docstring\\n self._verify_ip_logging_ok()\\n- if self.conf('auth-hook'):\\n- perform_achall = self._perform_achall_with_script\\n- else:\\n- perform_achall = self._perform_achall_manually\\n \\n responses = []\\n for achall in achalls:\\n- perform_achall(achall)\\n+ if self.conf('auth-hook'):\\n+ self._perform_achall_with_script(achall, achalls)\\n+ else:\\n+ self._perform_achall_manually(achall)\\n responses.append(achall.response(achall.account_key))\\n return responses\\n \\n@@ -134,9 +133,11 @@ def _verify_ip_logging_ok(self):\\n else:\\n raise errors.PluginError('Must agree to IP logging to proceed')\\n \\n- def _perform_achall_with_script(self, achall):\\n+ def _perform_achall_with_script(self, achall, achalls):\\n env = dict(CERTBOT_DOMAIN=achall.domain,\\n- CERTBOT_VALIDATION=achall.validation(achall.account_key))\\n+ CERTBOT_VALIDATION=achall.validation(achall.account_key),\\n+ CERTBOT_ALL_DOMAINS=','.join([one_achall.domain for one_achall in achalls]),\\n+ CERTBOT_REMAINING_CHALLENGES=str(len(achalls) - achalls.index(achall) - 1))\\n if isinstance(achall.chall, challenges.HTTP01):\\n env['CERTBOT_TOKEN'] = achall.chall.encode('token')\\n else:\\ndiff --git a/certbot/tests/plugins/manual_test.py b/certbot/tests/plugins/manual_test.py\\nindex bd11a9538d6..b4e19c420d0 100644\\n--- a/certbot/tests/plugins/manual_test.py\\n+++ b/certbot/tests/plugins/manual_test.py\\n@@ -72,16 +72,23 @@ def test_script_perform(self):\\n self.config.manual_public_ip_logging_ok = True\\n self.config.manual_auth_hook = (\\n '{0} -c \\\"from __future__ import print_function;'\\n- 'from certbot.compat import os; print(os.environ.get(\\\\'CERTBOT_DOMAIN\\\\'));'\\n+ 'from certbot.compat import os;'\\n+ 'print(os.environ.get(\\\\'CERTBOT_DOMAIN\\\\'));'\\n 'print(os.environ.get(\\\\'CERTBOT_TOKEN\\\\', \\\\'notoken\\\\'));'\\n- 'print(os.environ.get(\\\\'CERTBOT_VALIDATION\\\\', \\\\'novalidation\\\\'));\\\"'\\n+ 'print(os.environ.get(\\\\'CERTBOT_VALIDATION\\\\', \\\\'novalidation\\\\'));'\\n+ 'print(os.environ.get(\\\\'CERTBOT_ALL_DOMAINS\\\\'));'\\n+ 'print(os.environ.get(\\\\'CERTBOT_REMAINING_CHALLENGES\\\\'));\\\"'\\n .format(sys.executable))\\n- dns_expected = '{0}\\\\n{1}\\\\n{2}'.format(\\n+ dns_expected = '{0}\\\\n{1}\\\\n{2}\\\\n{3}\\\\n{4}'.format(\\n self.dns_achall.domain, 'notoken',\\n- self.dns_achall.validation(self.dns_achall.account_key))\\n- http_expected = '{0}\\\\n{1}\\\\n{2}'.format(\\n+ self.dns_achall.validation(self.dns_achall.account_key),\\n+ ','.join([achall.domain for achall in self.achalls]),\\n+ len(self.achalls) - self.achalls.index(self.dns_achall) - 1)\\n+ http_expected = '{0}\\\\n{1}\\\\n{2}\\\\n{3}\\\\n{4}'.format(\\n self.http_achall.domain, self.http_achall.chall.encode('token'),\\n- self.http_achall.validation(self.http_achall.account_key))\\n+ self.http_achall.validation(self.http_achall.account_key),\\n+ ','.join([achall.domain for achall in self.achalls]),\\n+ len(self.achalls) - self.achalls.index(self.http_achall) - 1)\\n \\n self.assertEqual(\\n self.auth.perform(self.achalls),\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -134,9 +133,11 @@ def _verify_ip_logging_ok(self):\n else:\n raise errors.PluginError('Must agree to IP logging to proceed')\n \n- def _perform_achall_with_script(self, achall):\n+ def _perform_achall_with_script(self, achall, achalls):\n env = dict(CERTBOT_DOMAIN=achall.domain,\n- CERTBOT_VALIDATION=achall.validation(achall.account_key))\n+ CERTBOT_VALIDATION=achall.validation(achall.account_key),\n+ CERTBOT_ALL_DOMAINS=','.join([one_achall.domain for one_achall in achalls]),","line":null,"original_line":139,"original_start_line":null,"path":"certbot/certbot/_internal/plugins/manual.py","start_line":null,"text":"@user1:\nPython does not really require the `[]` here because `join()` can act on a generator, not just a list. It would work equally well to say\r\n\r\n`.join(one_achall.domain for one_achall in achalls)`\r\n\r\nsince at least Python 2.6 and probably longer ago. :slightly_smiling_face: \n\n@author:\nThanks, I fixed that."}],"string":"[\n {\n \"diff_hunk\": \"@@ -134,9 +133,11 @@ def _verify_ip_logging_ok(self):\\n else:\\n raise errors.PluginError('Must agree to IP logging to proceed')\\n \\n- def _perform_achall_with_script(self, achall):\\n+ def _perform_achall_with_script(self, achall, achalls):\\n env = dict(CERTBOT_DOMAIN=achall.domain,\\n- CERTBOT_VALIDATION=achall.validation(achall.account_key))\\n+ CERTBOT_VALIDATION=achall.validation(achall.account_key),\\n+ CERTBOT_ALL_DOMAINS=','.join([one_achall.domain for one_achall in achalls]),\",\n \"line\": null,\n \"original_line\": 139,\n \"original_start_line\": null,\n \"path\": \"certbot/certbot/_internal/plugins/manual.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nPython does not really require the `[]` here because `join()` can act on a generator, not just a list. It would work equally well to say\\r\\n\\r\\n`.join(one_achall.domain for one_achall in achalls)`\\r\\n\\r\\nsince at least Python 2.6 and probably longer ago. :slightly_smiling_face: \\n\\n@author:\\nThanks, I fixed that.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"5fee153f755ca2f968cbf5572ddf7a597b000332"},"merged_patch":{"kind":"string","value":"diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md\nindex 868f3c8be78..903af0610ba 100644\n--- a/certbot/CHANGELOG.md\n+++ b/certbot/CHANGELOG.md\n@@ -6,7 +6,10 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).\n \n ### Added\n \n-*\n+* Expose two new environment variables in the authenticator and cleanup scripts used by\n+ the `manual` plugin: `CERTBOT_REMAINING_CHALLENGES` is equal to the number of challenges\n+ remaining after the current challenge, `CERTBOT_ALL_DOMAINS` is a comma-separated list\n+ of all domains challenged for the current certificate.\n \n ### Changed\n \ndiff --git a/certbot/certbot/_internal/plugins/manual.py b/certbot/certbot/_internal/plugins/manual.py\nindex 3204fe1dab2..87ccdbd7edf 100644\n--- a/certbot/certbot/_internal/plugins/manual.py\n+++ b/certbot/certbot/_internal/plugins/manual.py\n@@ -35,7 +35,11 @@ class Authenticator(common.Plugin):\n 'is the validation string, and $CERTBOT_TOKEN is the filename of the '\n 'resource requested when performing an HTTP-01 challenge. An additional '\n 'cleanup script can also be provided and can use the additional variable '\n- '$CERTBOT_AUTH_OUTPUT which contains the stdout output from the auth script.')\n+ '$CERTBOT_AUTH_OUTPUT which contains the stdout output from the auth script.'\n+ 'For both authenticator and cleanup script, on HTTP-01 and DNS-01 challenges,'\n+ '$CERTBOT_REMAINING_CHALLENGES will be equal to the number of challenges that '\n+ 'remain after the current one, and $CERTBOT_ALL_DOMAINS contains a comma-separated '\n+ 'list of all domains that are challenged for the current certificate.')\n _DNS_INSTRUCTIONS = \"\"\"\\\n Please deploy a DNS TXT record under the name\n {domain} with the following value:\n@@ -109,14 +113,13 @@ def get_chall_pref(self, domain):\n \n def perform(self, achalls): # pylint: disable=missing-function-docstring\n self._verify_ip_logging_ok()\n- if self.conf('auth-hook'):\n- perform_achall = self._perform_achall_with_script\n- else:\n- perform_achall = self._perform_achall_manually\n \n responses = []\n for achall in achalls:\n- perform_achall(achall)\n+ if self.conf('auth-hook'):\n+ self._perform_achall_with_script(achall, achalls)\n+ else:\n+ self._perform_achall_manually(achall)\n responses.append(achall.response(achall.account_key))\n return responses\n \n@@ -134,9 +137,11 @@ def _verify_ip_logging_ok(self):\n else:\n raise errors.PluginError('Must agree to IP logging to proceed')\n \n- def _perform_achall_with_script(self, achall):\n+ def _perform_achall_with_script(self, achall, achalls):\n env = dict(CERTBOT_DOMAIN=achall.domain,\n- CERTBOT_VALIDATION=achall.validation(achall.account_key))\n+ CERTBOT_VALIDATION=achall.validation(achall.account_key),\n+ CERTBOT_ALL_DOMAINS=','.join(one_achall.domain for one_achall in achalls),\n+ CERTBOT_REMAINING_CHALLENGES=str(len(achalls) - achalls.index(achall) - 1))\n if isinstance(achall.chall, challenges.HTTP01):\n env['CERTBOT_TOKEN'] = achall.chall.encode('token')\n else:\ndiff --git a/certbot/docs/using.rst b/certbot/docs/using.rst\nindex 8ec172c2421..7e37d3ef213 100644\n--- a/certbot/docs/using.rst\n+++ b/certbot/docs/using.rst\n@@ -736,8 +736,10 @@ the ``cleanup.sh`` script. Additionally certbot will pass relevant environment\n variables to these scripts:\n \n - ``CERTBOT_DOMAIN``: The domain being authenticated\n-- ``CERTBOT_VALIDATION``: The validation string (HTTP-01 and DNS-01 only)\n+- ``CERTBOT_VALIDATION``: The validation string\n - ``CERTBOT_TOKEN``: Resource name part of the HTTP-01 challenge (HTTP-01 only)\n+- ``CERTBOT_REMAINING_CHALLENGES``: Number of challenges remaining after the current challenge\n+- ``CERTBOT_ALL_DOMAINS``: A comma-separated list of all domains challenged for the current certificate\n \n Additionally for cleanup:\n \ndiff --git a/certbot/tests/plugins/manual_test.py b/certbot/tests/plugins/manual_test.py\nindex bd11a9538d6..6cdef148ac8 100644\n--- a/certbot/tests/plugins/manual_test.py\n+++ b/certbot/tests/plugins/manual_test.py\n@@ -72,16 +72,23 @@ def test_script_perform(self):\n self.config.manual_public_ip_logging_ok = True\n self.config.manual_auth_hook = (\n '{0} -c \"from __future__ import print_function;'\n- 'from certbot.compat import os; print(os.environ.get(\\'CERTBOT_DOMAIN\\'));'\n+ 'from certbot.compat import os;'\n+ 'print(os.environ.get(\\'CERTBOT_DOMAIN\\'));'\n 'print(os.environ.get(\\'CERTBOT_TOKEN\\', \\'notoken\\'));'\n- 'print(os.environ.get(\\'CERTBOT_VALIDATION\\', \\'novalidation\\'));\"'\n+ 'print(os.environ.get(\\'CERTBOT_VALIDATION\\', \\'novalidation\\'));'\n+ 'print(os.environ.get(\\'CERTBOT_ALL_DOMAINS\\'));'\n+ 'print(os.environ.get(\\'CERTBOT_REMAINING_CHALLENGES\\'));\"'\n .format(sys.executable))\n- dns_expected = '{0}\\n{1}\\n{2}'.format(\n+ dns_expected = '{0}\\n{1}\\n{2}\\n{3}\\n{4}'.format(\n self.dns_achall.domain, 'notoken',\n- self.dns_achall.validation(self.dns_achall.account_key))\n- http_expected = '{0}\\n{1}\\n{2}'.format(\n+ self.dns_achall.validation(self.dns_achall.account_key),\n+ ','.join(achall.domain for achall in self.achalls),\n+ len(self.achalls) - self.achalls.index(self.dns_achall) - 1)\n+ http_expected = '{0}\\n{1}\\n{2}\\n{3}\\n{4}'.format(\n self.http_achall.domain, self.http_achall.chall.encode('token'),\n- self.http_achall.validation(self.http_achall.account_key))\n+ self.http_achall.validation(self.http_achall.account_key),\n+ ','.join(achall.domain for achall in self.achalls),\n+ len(self.achalls) - self.achalls.index(self.http_achall) - 1)\n \n self.assertEqual(\n self.auth.perform(self.achalls),\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2393,"cells":{"instance_id":{"kind":"string","value":"dbt-labs__dbt-core-7577@86d6d98"},"repo":{"kind":"string","value":"dbt-labs/dbt-core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":7577,"string":"7,577"},"title":{"kind":"string","value":"CT 2510 Throw error for duplicate versioned and non versioned model names"},"body":{"kind":"string","value":"resolves #7487\r\n\r\n### Description\r\n\r\nThe _check_resource_uniqueness method in core/dbt/parser/manifest.py has been modified to check for non-versioned models with the same \"name\" as versioned models.\r\n\r\n### Checklist\r\n\r\n- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me\r\n- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)\r\n- [x] I have run this code in development and it appears to resolve the stated issue\r\n- [x] This PR includes tests, or tests are not required/relevant for this PR\r\n- [x] I have [opened an issue to add/update docs](https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose), or docs changes are not required/relevant for this PR\r\n- [x] I have run `changie new` to [create a changelog entry](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md#adding-a-changelog-entry)\r\n"},"created_at":{"kind":"string","value":"2023-05-09T21:09:58Z"},"problem_statement":{"kind":"string","value":"[CT-2510] [Bug] Raise an error if non-versioned model is defined with same name as existing versioned model\nSet up:\r\n```sql\r\n-- models/my_model_v1.sql\r\nselect 1 as id\r\n```\r\n```yml\r\n# models/whatever.yml\r\nmodels:\r\n - name: my_model\r\n versions:\r\n - v: 1\r\n```\r\n\r\n```\r\n$ dbt parse\r\n12:48:12 Running with dbt=1.5.0\r\n12:48:14 Performance info: target/perf_info.json\r\n```\r\nNow:\r\n- create `models/my_model.sql` (no version suffix)\r\n- do not add any new versions to the `versions` block in the yaml file\r\n\r\nRe-parse with partial parsing, and everything looks fine:\r\n```\r\n$ dbt parse\r\n12:48:29 Running with dbt=1.5.0\r\n12:48:30 Performance info: target/perf_info.json\r\n```\r\nAnd now without partial parsing, I see an error (good! I should!):\r\n```\r\n$ dbt --no-partial-parse parse\r\n12:48:43 Running with dbt=1.5.0\r\n12:48:46 Encountered an error:\r\nCompilation Error\r\n dbt found two models with the name \"my_model\".\r\n\r\n Since these resources have the same name, dbt will be unable to find the correct resource\r\n when looking for ref(\"my_model\").\r\n\r\n To fix this, change the name of one of these resources:\r\n - model.my_dbt_project.my_model (models/my_model.sql)\r\n - model.my_dbt_project.my_model.v1 (models/my_model_v1.sql)\r\n```"},"hints_text":{"kind":"string","value":"This is not a partial parsing bug per se. I've created a test case which does not fail appropriately even with full parsing.\nI haven't been able to recreate the compilation error. Whether I create the non-versioned model first or second, it never complains.\nI tried the same set of steps as outlined and was **not** able to produce the compilation error.\nI **can** reproduce this now. I accidentally didn't create and save `models/my_model.sql` 😅 \r\n\r\nHere's my key files at the end:\r\n\r\n`models/_models.yml`\r\n```yaml\r\nmodels:\r\n - name: my_model\r\n versions:\r\n - v: 1\r\n```\r\n\r\n`models/my_model_v1.sql`\r\n```sql\r\nselect 1 as id\r\n```\r\n\r\n`models/my_model.sql`\r\n```sql\r\nselect 0 as id\r\n```\nCommit 0de046dfbef53cfe754c87ec58a638c7a8962dc6 yesterday removed the code that was causing the error in the example to be thrown.\nThe error was thrown in the no-partial-parse case and not in the partial parse case because the order of the nodes encountered was different and the code was checking is_versioned for the previously encountered node."},"resolved_issues":{"kind":"list like","value":[{"body":"Set up:\r\n```sql\r\n-- models/my_model_v1.sql\r\nselect 1 as id\r\n```\r\n```yml\r\n# models/whatever.yml\r\nmodels:\r\n - name: my_model\r\n versions:\r\n - v: 1\r\n```\r\n\r\n```\r\n$ dbt parse\r\n12:48:12 Running with dbt=1.5.0\r\n12:48:14 Performance info: target/perf_info.json\r\n```\r\nNow:\r\n- create `models/my_model.sql` (no version suffix)\r\n- do not add any new versions to the `versions` block in the yaml file\r\n\r\nRe-parse with partial parsing, and everything looks fine:\r\n```\r\n$ dbt parse\r\n12:48:29 Running with dbt=1.5.0\r\n12:48:30 Performance info: target/perf_info.json\r\n```\r\nAnd now without partial parsing, I see an error (good! I should!):\r\n```\r\n$ dbt --no-partial-parse parse\r\n12:48:43 Running with dbt=1.5.0\r\n12:48:46 Encountered an error:\r\nCompilation Error\r\n dbt found two models with the name \"my_model\".\r\n\r\n Since these resources have the same name, dbt will be unable to find the correct resource\r\n when looking for ref(\"my_model\").\r\n\r\n To fix this, change the name of one of these resources:\r\n - model.my_dbt_project.my_model (models/my_model.sql)\r\n - model.my_dbt_project.my_model.v1 (models/my_model_v1.sql)\r\n```","number":7487,"title":"[CT-2510] [Bug] Raise an error if non-versioned model is defined with same name as existing versioned model"}],"string":"[\n {\n \"body\": \"Set up:\\r\\n```sql\\r\\n-- models/my_model_v1.sql\\r\\nselect 1 as id\\r\\n```\\r\\n```yml\\r\\n# models/whatever.yml\\r\\nmodels:\\r\\n - name: my_model\\r\\n versions:\\r\\n - v: 1\\r\\n```\\r\\n\\r\\n```\\r\\n$ dbt parse\\r\\n12:48:12 Running with dbt=1.5.0\\r\\n12:48:14 Performance info: target/perf_info.json\\r\\n```\\r\\nNow:\\r\\n- create `models/my_model.sql` (no version suffix)\\r\\n- do not add any new versions to the `versions` block in the yaml file\\r\\n\\r\\nRe-parse with partial parsing, and everything looks fine:\\r\\n```\\r\\n$ dbt parse\\r\\n12:48:29 Running with dbt=1.5.0\\r\\n12:48:30 Performance info: target/perf_info.json\\r\\n```\\r\\nAnd now without partial parsing, I see an error (good! I should!):\\r\\n```\\r\\n$ dbt --no-partial-parse parse\\r\\n12:48:43 Running with dbt=1.5.0\\r\\n12:48:46 Encountered an error:\\r\\nCompilation Error\\r\\n dbt found two models with the name \\\"my_model\\\".\\r\\n\\r\\n Since these resources have the same name, dbt will be unable to find the correct resource\\r\\n when looking for ref(\\\"my_model\\\").\\r\\n\\r\\n To fix this, change the name of one of these resources:\\r\\n - model.my_dbt_project.my_model (models/my_model.sql)\\r\\n - model.my_dbt_project.my_model.v1 (models/my_model_v1.sql)\\r\\n```\",\n \"number\": 7487,\n \"title\": \"[CT-2510] [Bug] Raise an error if non-versioned model is defined with same name as existing versioned model\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"43d949c5cc46da2e7c893f51fe4a35dc1486e3ac"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"86d6d98c590041084527aab6243207b48020eb9f\",\n \"head_commit_message\": \"Changie\",\n \"patch_to_review\": \"diff --git a/.changes/unreleased/Fixes-20230509-165007.yaml b/.changes/unreleased/Fixes-20230509-165007.yaml\\nnew file mode 100644\\nindex 00000000000..0c0f06b0525\\n--- /dev/null\\n+++ b/.changes/unreleased/Fixes-20230509-165007.yaml\\n@@ -0,0 +1,6 @@\\n+kind: Fixes\\n+body: Throw error for duplicated versioned and unversioned models\\n+time: 2023-05-09T16:50:07.530882-04:00\\n+custom:\\n+ Author: gshank\\n+ Issue: \\\"7487\\\"\\ndiff --git a/core/dbt/exceptions.py b/core/dbt/exceptions.py\\nindex e92948d9ad0..a50a0993b48 100644\\n--- a/core/dbt/exceptions.py\\n+++ b/core/dbt/exceptions.py\\n@@ -2187,6 +2187,25 @@ def get_message(self) -> str:\\n return msg\\n \\n \\n+class DuplicateVersionedUnversionedError(ParsingError):\\n+ def __init__(self, versioned_node, unversioned_node):\\n+ self.versioned_node = versioned_node\\n+ self.unversioned_node = unversioned_node\\n+ super().__init__(msg=self.get_message())\\n+\\n+ def get_message(self) -> str:\\n+ msg = f\\\"\\\"\\\"\\n+dbt found versioned and unversioned models with the name \\\"{self.versioned_node.name}\\\".\\n+\\n+Since these resources have the same name, dbt will be unable to find the correct resource\\n+when looking for ref({self.versioned_node.name}).\\n+\\n+To fix this, change the name of the unversioned resource:\\n+- {self.unversioned_node.unique_id} ({self.unversioned_node.original_file_path})\\n+ \\\"\\\"\\\".strip()\\n+ return msg\\n+\\n+\\n class PropertyYMLError(CompilationError):\\n def __init__(self, path: str, issue: str):\\n self.path = path\\ndiff --git a/core/dbt/parser/manifest.py b/core/dbt/parser/manifest.py\\nindex a0b1f34de37..f17ee1d8e79 100644\\n--- a/core/dbt/parser/manifest.py\\n+++ b/core/dbt/parser/manifest.py\\n@@ -1262,11 +1262,18 @@ def _check_resource_uniqueness(\\n config: RuntimeConfig,\\n ) -> None:\\n alias_resources: Dict[str, ManifestNode] = {}\\n+ versioned_resources: Dict[str, ManifestNode] = {}\\n+ unversioned_resources: Dict[str, ManifestNode] = {}\\n \\n for resource, node in manifest.nodes.items():\\n if not node.is_relational:\\n continue\\n \\n+ if node.is_versioned:\\n+ versioned_resources[node.name] = node\\n+ else:\\n+ unversioned_resources[node.name] = node\\n+\\n # the full node name is really defined by the adapter's relation\\n relation_cls = get_relation_class_by_name(config.credentials.type)\\n relation = relation_cls.create_from(config=config, node=node)\\n@@ -1280,6 +1287,17 @@ def _check_resource_uniqueness(\\n \\n alias_resources[full_node_name] = node\\n \\n+ intersection_versioned = set(versioned_resources.keys()).intersection(\\n+ set(unversioned_resources.keys())\\n+ )\\n+ if intersection_versioned:\\n+ for name in intersection_versioned:\\n+ versioned_node = versioned_resources[name]\\n+ unversioned_node = unversioned_resources[name]\\n+ raise dbt.exceptions.DuplicateVersionedUnversionedError(\\n+ versioned_node, unversioned_node\\n+ )\\n+\\n \\n def _warn_for_unused_resource_config_paths(manifest: Manifest, config: RuntimeConfig) -> None:\\n resource_fqns: Mapping[str, PathSet] = manifest.get_resource_fqns()\\ndiff --git a/tests/functional/partial_parsing/test_partial_parsing.py b/tests/functional/partial_parsing/test_partial_parsing.py\\nindex 76a06b69a3d..748747311c7 100644\\n--- a/tests/functional/partial_parsing/test_partial_parsing.py\\n+++ b/tests/functional/partial_parsing/test_partial_parsing.py\\n@@ -71,7 +71,7 @@\\n groups_schema_yml_two_groups_private_orders_invalid_access,\\n )\\n \\n-from dbt.exceptions import CompilationError, ParsingError\\n+from dbt.exceptions import CompilationError, ParsingError, DuplicateVersionedUnversionedError\\n from dbt.contracts.files import ParseFileType\\n from dbt.contracts.results import TestStatus\\n import re\\n@@ -358,6 +358,14 @@ def test_pp_versioned_models(self, project):\\n write_file(model_two_sql, project.project_root, \\\"models\\\", \\\"model_one_different.sql\\\")\\n results = run_dbt([\\\"--partial-parse\\\", \\\"run\\\"])\\n assert len(results) == 3\\n+ manifest = get_manifest(project.project_root)\\n+ assert len(manifest.nodes) == 3\\n+ print(f\\\"--- nodes: {manifest.nodes.keys()}\\\")\\n+\\n+ # create a new model_one in model_one.sql and re-parse\\n+ write_file(model_one_sql, project.project_root, \\\"models\\\", \\\"model_one.sql\\\")\\n+ with pytest.raises(DuplicateVersionedUnversionedError):\\n+ run_dbt([\\\"parse\\\"])\\n \\n \\n class TestSources:\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -1280,6 +1287,17 @@ def _check_resource_uniqueness(\n \n alias_resources[full_node_name] = node\n \n+ intersection_versioned = set(versioned_resources.keys()).intersection(\n+ set(unversioned_resources.keys())\n+ )\n+ if intersection_versioned:","line":null,"original_line":1293,"original_start_line":null,"path":"core/dbt/parser/manifest.py","start_line":null,"text":"@user1:\nI think raising this sets us back in terms of being able to handle ref-able resource with duplicate names across packages. For example - if I define project_a.model (unversioned) and project_b.model.v1 (versioned) - those work when run in their respective projects as root, but when installed as packages would raise `DuplicateVersionedUnversionedError`\n\n@author:\nI'm thinking that we need to store the versioned_resources and unversioned_resources by package. Maybe we'd only need to check the root package?\n\n@author:\nI've updated the code to check versioned/unversioned by packages and tweaked the error message to also suggest adding the unversioned model to the versions."},{"diff_hunk":"@@ -2187,6 +2187,25 @@ def get_message(self) -> str:\n return msg\n \n \n+class DuplicateVersionedUnversionedError(ParsingError):\n+ def __init__(self, versioned_node, unversioned_node):\n+ self.versioned_node = versioned_node\n+ self.unversioned_node = unversioned_node\n+ super().__init__(msg=self.get_message())\n+\n+ def get_message(self) -> str:\n+ msg = f\"\"\"\n+dbt found versioned and unversioned models with the name \"{self.versioned_node.name}\".\n+\n+Since these resources have the same name, dbt will be unable to find the correct resource\n+when looking for ref({self.versioned_node.name}).","line":null,"original_line":2201,"original_start_line":null,"path":"core/dbt/exceptions.py","start_line":null,"text":"@user1:\ntiny nit - adding quotes around the node: `ref('{self.versioned_node.name}')`\n\n@author:\nAdded quotes."}],"string":"[\n {\n \"diff_hunk\": \"@@ -1280,6 +1287,17 @@ def _check_resource_uniqueness(\\n \\n alias_resources[full_node_name] = node\\n \\n+ intersection_versioned = set(versioned_resources.keys()).intersection(\\n+ set(unversioned_resources.keys())\\n+ )\\n+ if intersection_versioned:\",\n \"line\": null,\n \"original_line\": 1293,\n \"original_start_line\": null,\n \"path\": \"core/dbt/parser/manifest.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nI think raising this sets us back in terms of being able to handle ref-able resource with duplicate names across packages. For example - if I define project_a.model (unversioned) and project_b.model.v1 (versioned) - those work when run in their respective projects as root, but when installed as packages would raise `DuplicateVersionedUnversionedError`\\n\\n@author:\\nI'm thinking that we need to store the versioned_resources and unversioned_resources by package. Maybe we'd only need to check the root package?\\n\\n@author:\\nI've updated the code to check versioned/unversioned by packages and tweaked the error message to also suggest adding the unversioned model to the versions.\"\n },\n {\n \"diff_hunk\": \"@@ -2187,6 +2187,25 @@ def get_message(self) -> str:\\n return msg\\n \\n \\n+class DuplicateVersionedUnversionedError(ParsingError):\\n+ def __init__(self, versioned_node, unversioned_node):\\n+ self.versioned_node = versioned_node\\n+ self.unversioned_node = unversioned_node\\n+ super().__init__(msg=self.get_message())\\n+\\n+ def get_message(self) -> str:\\n+ msg = f\\\"\\\"\\\"\\n+dbt found versioned and unversioned models with the name \\\"{self.versioned_node.name}\\\".\\n+\\n+Since these resources have the same name, dbt will be unable to find the correct resource\\n+when looking for ref({self.versioned_node.name}).\",\n \"line\": null,\n \"original_line\": 2201,\n \"original_start_line\": null,\n \"path\": \"core/dbt/exceptions.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\ntiny nit - adding quotes around the node: `ref('{self.versioned_node.name}')`\\n\\n@author:\\nAdded quotes.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"4377af79d34b3272136477ef02dc18b3e37a00e0"},"merged_patch":{"kind":"string","value":"diff --git a/.changes/unreleased/Fixes-20230509-165007.yaml b/.changes/unreleased/Fixes-20230509-165007.yaml\nnew file mode 100644\nindex 00000000000..0c0f06b0525\n--- /dev/null\n+++ b/.changes/unreleased/Fixes-20230509-165007.yaml\n@@ -0,0 +1,6 @@\n+kind: Fixes\n+body: Throw error for duplicated versioned and unversioned models\n+time: 2023-05-09T16:50:07.530882-04:00\n+custom:\n+ Author: gshank\n+ Issue: \"7487\"\ndiff --git a/core/dbt/exceptions.py b/core/dbt/exceptions.py\nindex e92948d9ad0..e3ff3a419c6 100644\n--- a/core/dbt/exceptions.py\n+++ b/core/dbt/exceptions.py\n@@ -2187,6 +2187,26 @@ def get_message(self) -> str:\n return msg\n \n \n+class DuplicateVersionedUnversionedError(ParsingError):\n+ def __init__(self, versioned_node, unversioned_node):\n+ self.versioned_node = versioned_node\n+ self.unversioned_node = unversioned_node\n+ super().__init__(msg=self.get_message())\n+\n+ def get_message(self) -> str:\n+ msg = f\"\"\"\n+dbt found versioned and unversioned models with the name \"{self.versioned_node.name}\".\n+\n+Since these resources have the same name, dbt will be unable to find the correct resource\n+when looking for ref('{self.versioned_node.name}').\n+\n+To fix this, change the name of the unversioned resource\n+{self.unversioned_node.unique_id} ({self.unversioned_node.original_file_path})\n+or add the unversioned model to the versions in {self.versioned_node.patch_path}\n+ \"\"\".strip()\n+ return msg\n+\n+\n class PropertyYMLError(CompilationError):\n def __init__(self, path: str, issue: str):\n self.path = path\ndiff --git a/core/dbt/parser/manifest.py b/core/dbt/parser/manifest.py\nindex a0b1f34de37..b650e971f98 100644\n--- a/core/dbt/parser/manifest.py\n+++ b/core/dbt/parser/manifest.py\n@@ -1262,11 +1262,19 @@ def _check_resource_uniqueness(\n config: RuntimeConfig,\n ) -> None:\n alias_resources: Dict[str, ManifestNode] = {}\n+ name_resources: Dict[str, Dict] = {}\n \n for resource, node in manifest.nodes.items():\n if not node.is_relational:\n continue\n \n+ if node.package_name not in name_resources:\n+ name_resources[node.package_name] = {\"ver\": {}, \"unver\": {}}\n+ if node.is_versioned:\n+ name_resources[node.package_name][\"ver\"][node.name] = node\n+ else:\n+ name_resources[node.package_name][\"unver\"][node.name] = node\n+\n # the full node name is really defined by the adapter's relation\n relation_cls = get_relation_class_by_name(config.credentials.type)\n relation = relation_cls.create_from(config=config, node=node)\n@@ -1280,6 +1288,18 @@ def _check_resource_uniqueness(\n \n alias_resources[full_node_name] = node\n \n+ for ver_unver_dict in name_resources.values():\n+ versioned_names = ver_unver_dict[\"ver\"].keys()\n+ unversioned_names = ver_unver_dict[\"unver\"].keys()\n+ intersection_versioned = set(versioned_names).intersection(set(unversioned_names))\n+ if intersection_versioned:\n+ for name in intersection_versioned:\n+ versioned_node = ver_unver_dict[\"ver\"][name]\n+ unversioned_node = ver_unver_dict[\"unver\"][name]\n+ raise dbt.exceptions.DuplicateVersionedUnversionedError(\n+ versioned_node, unversioned_node\n+ )\n+\n \n def _warn_for_unused_resource_config_paths(manifest: Manifest, config: RuntimeConfig) -> None:\n resource_fqns: Mapping[str, PathSet] = manifest.get_resource_fqns()\ndiff --git a/tests/functional/partial_parsing/test_partial_parsing.py b/tests/functional/partial_parsing/test_partial_parsing.py\nindex 76a06b69a3d..748747311c7 100644\n--- a/tests/functional/partial_parsing/test_partial_parsing.py\n+++ b/tests/functional/partial_parsing/test_partial_parsing.py\n@@ -71,7 +71,7 @@\n groups_schema_yml_two_groups_private_orders_invalid_access,\n )\n \n-from dbt.exceptions import CompilationError, ParsingError\n+from dbt.exceptions import CompilationError, ParsingError, DuplicateVersionedUnversionedError\n from dbt.contracts.files import ParseFileType\n from dbt.contracts.results import TestStatus\n import re\n@@ -358,6 +358,14 @@ def test_pp_versioned_models(self, project):\n write_file(model_two_sql, project.project_root, \"models\", \"model_one_different.sql\")\n results = run_dbt([\"--partial-parse\", \"run\"])\n assert len(results) == 3\n+ manifest = get_manifest(project.project_root)\n+ assert len(manifest.nodes) == 3\n+ print(f\"--- nodes: {manifest.nodes.keys()}\")\n+\n+ # create a new model_one in model_one.sql and re-parse\n+ write_file(model_one_sql, project.project_root, \"models\", \"model_one.sql\")\n+ with pytest.raises(DuplicateVersionedUnversionedError):\n+ run_dbt([\"parse\"])\n \n \n class TestSources:\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2394,"cells":{"instance_id":{"kind":"string","value":"getredash__redash-5088@311ec78"},"repo":{"kind":"string","value":"getredash/redash"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":5088,"string":"5,088"},"title":{"kind":"string","value":"Add default limit (1000) to SQL queries"},"body":{"kind":"string","value":"## What type of PR is this? (check all applicable)\r\n\r\n- [x] Feature\r\n\r\n## Description\r\n\r\nAdd a default limit 1000 for query execution, now it contains both the frontend changes(add a checkbox) and backend changes.\r\n## Related Tickets & Documents\r\n\r\nREDASH-112, Closes #976.\r\n\r\n## Mobile & Desktop Screenshots/Recordings (if there are UI changes)\r\nThis is for data source that currently support auto limit\r\n<img width=\"861\" alt=\"Screen Shot 2020-08-27 at 10 12 49 AM\" src=\"https://user-images.githubusercontent.com/25569264/91473627-03f98a00-e84e-11ea-8838-244ccd9f3369.png\">\r\n\r\n\r\nThis is for data source that currently not support auto limit\r\n<img width=\"858\" alt=\"Screen Shot 2020-08-27 at 10 13 05 AM\" src=\"https://user-images.githubusercontent.com/25569264/91473638-078d1100-e84e-11ea-8a36-c121fd2f4126.png\">\r\n\r\n\r\n"},"created_at":{"kind":"string","value":"2020-08-04T16:24:44Z"},"problem_statement":{"kind":"string","value":"Limit number of records returned by a query\nI typically run `SELECT * FROM ...` just to get a peak on the data and in many cases forget to add limit (yeah I know I know....) .\n\nIt would be nice if REDASH would have tunable default limit e.g. 10,000 rows (same way most of the desktop tools like TOAD or Navicat have). Not sure if this is easy to do for any data sources, its certainly trivial for postgres (it executes the limit as a last step).\n\nIdeally displayed on the new query page right next to \"refresh schedule\". This way user knows about it and can easily change it."},"hints_text":{"kind":"string","value":"Sounds like a good feature, but need some research on how it will work with the different data source types. Also need to make sure not to apply it to non SELECT queries.\n\nPlease find below an example:\r\n`SELECT * FROM table LIMIT 5;`\nany development yet for this feature ? \nWe get very high celery CPU load occasionally, which locks up redash. Likely due to users running queries against large datasets without a LIMIT. Zeppelin has a similar feature (Row count limit per datasource, and data length limit as well). Would be great if this was added. We might just build this out when we get some time.\ntry \r\n`set rowcount 10000;`\r\n`select * FROM table;`\nThe problem with this matter is that the command highly depends on the DB that it's running the query.\r\n\r\n@ninja-ken your solution may not work on all data-sources.\r\n\r\n@arikfr What about add in the data-source implementation a way to determine the row count limit for itself? That way, redash could call each function of each data-source. Do you think that can work?\nHey, anything on this feature request?\nHi, Any update on this feature request? This will help us out a lot!\nI think I will try superset for now. They have this feature and many other features(scheduling etc.) out of the box. Will keep a look on this thread though."},"resolved_issues":{"kind":"list like","value":[{"body":"I typically run `SELECT * FROM ...` just to get a peak on the data and in many cases forget to add limit (yeah I know I know....) .\n\nIt would be nice if REDASH would have tunable default limit e.g. 10,000 rows (same way most of the desktop tools like TOAD or Navicat have). Not sure if this is easy to do for any data sources, its certainly trivial for postgres (it executes the limit as a last step).\n\nIdeally displayed on the new query page right next to \"refresh schedule\". This way user knows about it and can easily change it.\n","number":976,"title":"Limit number of records returned by a query"}],"string":"[\n {\n \"body\": \"I typically run `SELECT * FROM ...` just to get a peak on the data and in many cases forget to add limit (yeah I know I know....) .\\n\\nIt would be nice if REDASH would have tunable default limit e.g. 10,000 rows (same way most of the desktop tools like TOAD or Navicat have). Not sure if this is easy to do for any data sources, its certainly trivial for postgres (it executes the limit as a last step).\\n\\nIdeally displayed on the new query page right next to \\\"refresh schedule\\\". This way user knows about it and can easily change it.\\n\",\n \"number\": 976,\n \"title\": \"Limit number of records returned by a query\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"31ddd0fb7999d427bcc8707e016038b90b63e032"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"311ec780902dcc018f692ea4170557d9ea406b98\",\n \"head_commit_message\": \"Add frontend changes and connect to backend\",\n \"patch_to_review\": \"diff --git a/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx\\nnew file mode 100644\\nindex 0000000000..4ac0330299\\n--- /dev/null\\n+++ b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx\\n@@ -0,0 +1,37 @@\\n+import React, { useCallback } from \\\"react\\\";\\n+import PropTypes from \\\"prop-types\\\";\\n+import recordEvent from \\\"@/services/recordEvent\\\";\\n+import Checkbox from \\\"antd/lib/checkbox\\\";\\n+import Tooltip from \\\"antd/lib/tooltip\\\";\\n+\\n+export default function AutoLimitCheckbox({ available, checked, onChange }) {\\n+ const handleClick = useCallback(() => {\\n+ recordEvent(\\\"checkbox_auto_limit\\\", \\\"screen\\\", \\\"query_editor\\\", { state: !checked });\\n+ onChange(!checked);\\n+ }, [checked, onChange]);\\n+\\n+ let tooltipMessage = null;\\n+ if (!available) {\\n+ tooltipMessage = \\\"Auto limiting is not available for this Data Source type.\\\";\\n+ } else {\\n+ tooltipMessage = \\\"Auto limit results to first 1000 rows.\\\";\\n+ }\\n+\\n+ return (\\n+ <Tooltip placement=\\\"top\\\" title={tooltipMessage}>\\n+ <Checkbox\\n+ className=\\\"query-editor-controls-checkbox\\\"\\n+ disabled={!available}\\n+ onClick={handleClick}\\n+ checked={available && checked}>\\n+ LIMIT 1000\\n+ </Checkbox>\\n+ </Tooltip>\\n+ );\\n+}\\n+\\n+AutoLimitCheckbox.propTypes = {\\n+ available: PropTypes.bool,\\n+ checked: PropTypes.bool.isRequired,\\n+ onChange: PropTypes.func.isRequired,\\n+};\\ndiff --git a/client/app/components/queries/QueryEditor/QueryEditorControls.jsx b/client/app/components/queries/QueryEditor/QueryEditorControls.jsx\\nindex cf02c8535e..9507c5a11e 100644\\n--- a/client/app/components/queries/QueryEditor/QueryEditorControls.jsx\\n+++ b/client/app/components/queries/QueryEditor/QueryEditorControls.jsx\\n@@ -8,6 +8,7 @@ import KeyboardShortcuts, { humanReadableShortcut } from \\\"@/services/KeyboardSho\\n \\n import AutocompleteToggle from \\\"./AutocompleteToggle\\\";\\n import \\\"./QueryEditorControls.less\\\";\\n+import AutoLimitCheckbox from \\\"@/components/queries/QueryEditor/AutoLimitCheckbox\\\";\\n \\n export function ButtonTooltip({ title, shortcut, ...props }) {\\n shortcut = humanReadableShortcut(shortcut, 1); // show only primary shortcut\\n@@ -38,6 +39,7 @@ export default function EditorControl({\\n saveButtonProps,\\n executeButtonProps,\\n autocompleteToggleProps,\\n+ autoLimitCheckboxProps,\\n dataSourceSelectorProps,\\n }) {\\n useEffect(() => {\\n@@ -84,6 +86,7 @@ export default function EditorControl({\\n onToggle={autocompleteToggleProps.onToggle}\\n />\\n )}\\n+ {autoLimitCheckboxProps !== false && <AutoLimitCheckbox {...autoLimitCheckboxProps} />}\\n {dataSourceSelectorProps === false && <span className=\\\"query-editor-controls-spacer\\\" />}\\n {dataSourceSelectorProps !== false && (\\n <Select\\n@@ -153,6 +156,7 @@ EditorControl.propTypes = {\\n onToggle: PropTypes.func,\\n }),\\n ]),\\n+ autoLimitCheckboxProps: PropTypes.oneOfType([PropTypes.shape(AutoLimitCheckbox.propTypes)]),\\n dataSourceSelectorProps: PropTypes.oneOfType([\\n PropTypes.bool, // `false` to hide\\n PropTypes.shape({\\n@@ -175,5 +179,6 @@ EditorControl.defaultProps = {\\n saveButtonProps: false,\\n executeButtonProps: false,\\n autocompleteToggleProps: false,\\n+ autoLimitCheckboxProps: false,\\n dataSourceSelectorProps: false,\\n };\\ndiff --git a/client/app/components/queries/QueryEditor/QueryEditorControls.less b/client/app/components/queries/QueryEditor/QueryEditorControls.less\\nindex f81c152ae5..118698dc79 100644\\n--- a/client/app/components/queries/QueryEditor/QueryEditorControls.less\\n+++ b/client/app/components/queries/QueryEditor/QueryEditorControls.less\\n@@ -21,6 +21,12 @@\\n }\\n }\\n \\n+ .query-editor-controls-checkbox {\\n+ display: inline-block;\\n+ white-space: nowrap;\\n+ margin: auto 5px;\\n+ }\\n+\\n .query-editor-controls-spacer {\\n flex: 1 1 auto;\\n height: 35px; // same as Antd <Select>\\ndiff --git a/client/app/pages/queries/QuerySource.jsx b/client/app/pages/queries/QuerySource.jsx\\nindex 2f97c50662..48473d886c 100644\\n--- a/client/app/pages/queries/QuerySource.jsx\\n+++ b/client/app/pages/queries/QuerySource.jsx\\n@@ -26,6 +26,7 @@ import { getEditorComponents } from \\\"@/components/queries/editor-components\\\";\\n import useQuery from \\\"./hooks/useQuery\\\";\\n import useVisualizationTabHandler from \\\"./hooks/useVisualizationTabHandler\\\";\\n import useAutocompleteFlags from \\\"./hooks/useAutocompleteFlags\\\";\\n+import useAutoLimitFlags from \\\"./hooks/useAutoLimitFlags\\\";\\n import useQueryExecute from \\\"./hooks/useQueryExecute\\\";\\n import useQueryResultData from \\\"@/lib/useQueryResultData\\\";\\n import useQueryDataSources from \\\"./hooks/useQueryDataSources\\\";\\n@@ -77,6 +78,7 @@ function QuerySource(props) {\\n \\n const editorRef = useRef(null);\\n const [autocompleteAvailable, autocompleteEnabled, toggleAutocomplete] = useAutocompleteFlags(schema);\\n+ const [autoLimitAvailable, autoLimitChecked, setAutoLimit] = useAutoLimitFlags(dataSource, query, setQuery);\\n \\n const [handleQueryEditorChange] = useDebouncedCallback(queryText => {\\n setQuery(extend(query.clone(), { query: queryText }));\\n@@ -306,6 +308,11 @@ function QuerySource(props) {\\n enabled: autocompleteEnabled,\\n onToggle: toggleAutocomplete,\\n }}\\n+ autoLimitCheckboxProps={{\\n+ available: autoLimitAvailable,\\n+ checked: autoLimitChecked,\\n+ onChange: setAutoLimit,\\n+ }}\\n dataSourceSelectorProps={\\n dataSource\\n ? {\\ndiff --git a/client/app/pages/queries/hooks/useAutoLimitFlags.js b/client/app/pages/queries/hooks/useAutoLimitFlags.js\\nnew file mode 100644\\nindex 0000000000..92688e1882\\n--- /dev/null\\n+++ b/client/app/pages/queries/hooks/useAutoLimitFlags.js\\n@@ -0,0 +1,24 @@\\n+import { useCallback, useState } from \\\"react\\\";\\n+import localOptions from \\\"@/lib/localOptions\\\";\\n+import { get, extend } from \\\"lodash\\\";\\n+\\n+function isAutoLimitAvailable(dataSource) {\\n+ return get(dataSource, \\\"apply_auto_limit\\\", false);\\n+}\\n+\\n+export default function useAutoLimitFlags(dataSource, query, setQuery) {\\n+ const isAvailable = isAutoLimitAvailable(dataSource);\\n+ const [isChecked, setIsChecked] = useState(localOptions.get(\\\"applyAutoLimit\\\", true));\\n+ query.options.applyAutoLimit = isAvailable && isChecked;\\n+\\n+ const setAutoLimit = useCallback(\\n+ state => {\\n+ setIsChecked(state);\\n+ localOptions.set(\\\"applyAutoLimit\\\", state);\\n+ setQuery(extend(query.clone(), { options: { ...query.options, applyAutoLimit: isAvailable && state } }));\\n+ },\\n+ [query, setQuery, isAvailable]\\n+ );\\n+\\n+ return [isAvailable, isChecked, setAutoLimit];\\n+}\\ndiff --git a/client/app/services/query-result.js b/client/app/services/query-result.js\\nindex 0f39778c0c..dc4874da86 100644\\n--- a/client/app/services/query-result.js\\n+++ b/client/app/services/query-result.js\\n@@ -435,11 +435,11 @@ class QueryResult {\\n return `${queryName.replace(/ /g, \\\"_\\\") + moment(this.getUpdatedAt()).format(\\\"_YYYY_MM_DD\\\")}.${fileType}`;\\n }\\n \\n- static getByQueryId(id, parameters, maxAge) {\\n+ static getByQueryId(id, parameters, applyAutoLimit, maxAge) {\\n const queryResult = new QueryResult();\\n \\n axios\\n- .post(`api/queries/${id}/results`, { id, parameters, max_age: maxAge })\\n+ .post(`api/queries/${id}/results`, { id, parameters, apply_auto_limit: applyAutoLimit, max_age: maxAge })\\n .then(response => {\\n queryResult.update(response);\\n \\n@@ -454,13 +454,14 @@ class QueryResult {\\n return queryResult;\\n }\\n \\n- static get(dataSourceId, query, parameters, maxAge, queryId) {\\n+ static get(dataSourceId, query, parameters, applyAutoLimit, maxAge, queryId) {\\n const queryResult = new QueryResult();\\n \\n const params = {\\n data_source_id: dataSourceId,\\n parameters,\\n query,\\n+ apply_auto_limit: applyAutoLimit,\\n max_age: maxAge,\\n };\\n \\ndiff --git a/client/app/services/query.js b/client/app/services/query.js\\nindex 66ba2be6b8..a756114d39 100644\\n--- a/client/app/services/query.js\\n+++ b/client/app/services/query.js\\n@@ -130,7 +130,8 @@ export class Query {\\n }\\n \\n getQueryResult(maxAge) {\\n- const execute = () => QueryResult.getByQueryId(this.id, this.getParameters().getExecutionValues(), maxAge);\\n+ const execute = () =>\\n+ QueryResult.getByQueryId(this.id, this.getParameters().getExecutionValues(), this.getAutoLimit(), maxAge);\\n return this.prepareQueryResultExecution(execute, maxAge);\\n }\\n \\n@@ -141,7 +142,8 @@ export class Query {\\n }\\n \\n const parameters = this.getParameters().getExecutionValues({ joinListValues: true });\\n- const execute = () => QueryResult.get(this.data_source_id, queryText, parameters, maxAge, this.id);\\n+ const execute = () =>\\n+ QueryResult.get(this.data_source_id, queryText, parameters, this.getAutoLimit(), maxAge, this.id);\\n return this.prepareQueryResultExecution(execute, maxAge);\\n }\\n \\n@@ -184,6 +186,10 @@ export class Query {\\n return this.$parameters;\\n }\\n \\n+ getAutoLimit() {\\n+ return this.options.applyAutoLimit;\\n+ }\\n+\\n getParametersDefs(update = true) {\\n return this.getParameters().get(update);\\n }\\ndiff --git a/redash/handlers/queries.py b/redash/handlers/queries.py\\nindex 5511d43a3e..266092e4d8 100644\\n--- a/redash/handlers/queries.py\\n+++ b/redash/handlers/queries.py\\n@@ -488,9 +488,9 @@ def post(self, query_id):\\n \\n parameter_values = collect_parameters_from_request(request.args)\\n parameterized_query = ParameterizedQuery(query.query_text, org=self.current_org)\\n-\\n+ apply_auto_limit = query.options.get(\\\"apply_auto_limit\\\", False)\\n return run_query(\\n- parameterized_query, parameter_values, query.data_source, query.id\\n+ parameterized_query, parameter_values, query.data_source, query.id, apply_auto_limit\\n )\\n \\n \\ndiff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py\\nindex 4b9e189cce..8b6dbb6628 100644\\n--- a/redash/handlers/query_results.py\\n+++ b/redash/handlers/query_results.py\\n@@ -61,7 +61,7 @@ def error_response(message, http_status=400):\\n }\\n \\n \\n-def run_query(query, parameters, data_source, query_id, max_age=0):\\n+def run_query(query, parameters, data_source, query_id, apply_auto_limit, max_age=0):\\n if data_source.paused:\\n if data_source.pause_reason:\\n message = \\\"{} is paused ({}). Please try later.\\\".format(\\n@@ -77,6 +77,8 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\\n except (InvalidParameterError, QueryDetachedFromDataSourceError) as e:\\n abort(400, message=str(e))\\n \\n+ query_text = data_source.query_runner.apply_auto_limit(query.text, apply_auto_limit)\\n+\\n if query.missing_params:\\n return error_response(\\n \\\"Missing parameter value for: {}\\\".format(\\\", \\\".join(query.missing_params))\\n@@ -85,7 +87,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\\n if max_age == 0:\\n query_result = None\\n else:\\n- query_result = models.QueryResult.get_latest(data_source, query.text, max_age)\\n+ query_result = models.QueryResult.get_latest(data_source, query_text, max_age)\\n \\n record_event(\\n current_user.org,\\n@@ -95,7 +97,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\\n \\\"cache\\\": \\\"hit\\\" if query_result else \\\"miss\\\",\\n \\\"object_id\\\": data_source.id,\\n \\\"object_type\\\": \\\"data_source\\\",\\n- \\\"query\\\": query.text,\\n+ \\\"query\\\": query_text,\\n \\\"query_id\\\": query_id,\\n \\\"parameters\\\": parameters,\\n },\\n@@ -109,7 +111,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\\n }\\n else:\\n job = enqueue_query(\\n- query.text,\\n+ query_text,\\n data_source,\\n current_user.id,\\n current_user.is_api_user(),\\n@@ -180,6 +182,7 @@ def post(self):\\n )\\n \\n parameterized_query = ParameterizedQuery(query, org=self.current_org)\\n+ apply_auto_limit = params.get(\\\"apply_auto_limit\\\", False)\\n \\n data_source_id = params.get(\\\"data_source_id\\\")\\n if data_source_id:\\n@@ -193,7 +196,7 @@ def post(self):\\n return error_messages[\\\"no_permission\\\"]\\n \\n return run_query(\\n- parameterized_query, parameters, data_source, query_id, max_age\\n+ parameterized_query, parameters, data_source, query_id, apply_auto_limit, max_age\\n )\\n \\n \\n@@ -286,6 +289,7 @@ def post(self, query_id):\\n )\\n \\n allow_executing_with_view_only_permissions = query.parameterized.is_safe\\n+ apply_auto_limit = params.get(\\\"apply_auto_limit\\\", False)\\n \\n if has_access(\\n query, self.current_user, allow_executing_with_view_only_permissions\\n@@ -295,6 +299,7 @@ def post(self, query_id):\\n parameter_values,\\n query.data_source,\\n query_id,\\n+ apply_auto_limit,\\n max_age,\\n )\\n else:\\ndiff --git a/redash/models/__init__.py b/redash/models/__init__.py\\nindex 1d5528aaca..c109fe43d4 100644\\n--- a/redash/models/__init__.py\\n+++ b/redash/models/__init__.py\\n@@ -122,6 +122,7 @@ def to_dict(self, all=False, with_permissions_for=None):\\n \\\"syntax\\\": self.query_runner.syntax,\\n \\\"paused\\\": self.paused,\\n \\\"pause_reason\\\": self.pause_reason,\\n+ \\\"apply_auto_limit\\\": self.query_runner.supports_auto_limit\\n }\\n \\n if all:\\ndiff --git a/redash/query_runner/__init__.py b/redash/query_runner/__init__.py\\nindex 9f92ffe637..2a2b4e5388 100644\\n--- a/redash/query_runner/__init__.py\\n+++ b/redash/query_runner/__init__.py\\n@@ -10,7 +10,7 @@\\n from six import text_type\\n from sshtunnel import open_tunnel\\n from redash import settings\\n-from redash.utils import json_loads\\n+from redash.utils import json_loads, query_is_select_no_limit, add_limit_to_query\\n from rq.timeouts import JobTimeoutException\\n \\n from redash.utils.requests_session import requests, requests_session\\n@@ -83,7 +83,7 @@ def host(self):\\n \\\"\\\"\\\"Returns this query runner's configured host.\\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\\n \\n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \\n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\\n \\\"\\\"\\\"\\n if \\\"host\\\" in self.configuration:\\n@@ -96,7 +96,7 @@ def host(self, host):\\n \\\"\\\"\\\"Sets this query runner's configured host.\\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\\n \\n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \\n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\\n \\\"\\\"\\\"\\n if \\\"host\\\" in self.configuration:\\n@@ -109,7 +109,7 @@ def port(self):\\n \\\"\\\"\\\"Returns this query runner's configured port.\\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\\n \\n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \\n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\\n \\\"\\\"\\\"\\n if \\\"port\\\" in self.configuration:\\n@@ -122,7 +122,7 @@ def port(self, port):\\n \\\"\\\"\\\"Sets this query runner's configured port.\\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\\n \\n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \\n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\\n \\\"\\\"\\\"\\n if \\\"port\\\" in self.configuration:\\n@@ -190,6 +190,13 @@ def to_dict(cls):\\n **({\\\"deprecated\\\": True} if cls.deprecated else {}),\\n }\\n \\n+ @property\\n+ def supports_auto_limit(self):\\n+ return False\\n+\\n+ def apply_auto_limit(self, query_text, set_auto_limit):\\n+ return query_text\\n+\\n \\n class BaseSQLQueryRunner(BaseQueryRunner):\\n def get_schema(self, get_stats=False):\\n@@ -208,6 +215,22 @@ def _get_tables_stats(self, tables_dict):\\n res = self._run_query_internal(\\\"select count(*) as cnt from %s\\\" % t)\\n tables_dict[t][\\\"size\\\"] = res[0][\\\"cnt\\\"]\\n \\n+ @property\\n+ def supports_auto_limit(self):\\n+ return True\\n+\\n+ def apply_auto_limit(self, query_text, set_auto_limit):\\n+ if set_auto_limit:\\n+ from redash.query_runner.databricks import split_sql_statements\\n+ query_list = split_sql_statements(query_text)\\n+ # we only check for last one in the list because it is the one that we show result\\n+ last_query = query_list[-1]\\n+ if query_is_select_no_limit(last_query):\\n+ query_list[-1] = add_limit_to_query(last_query)\\n+ return \\\";\\\\n\\\".join(query_list)\\n+ else:\\n+ return query_text\\n+\\n \\n def is_private_address(url):\\n hostname = urlparse(url).hostname\\ndiff --git a/redash/tasks/queries/maintenance.py b/redash/tasks/queries/maintenance.py\\nindex c54cd05aa3..92e37f5547 100644\\n--- a/redash/tasks/queries/maintenance.py\\n+++ b/redash/tasks/queries/maintenance.py\\n@@ -76,6 +76,11 @@ class RefreshQueriesError(Exception):\\n pass\\n \\n \\n+def _apply_auto_limit(query_text, query):\\n+ set_auto_limit = query.options.get(\\\"apply_auto_limit\\\", False)\\n+ return query.data_source.query_runner.apply_auto_limit(query_text, set_auto_limit)\\n+\\n+\\n def refresh_queries():\\n logger.info(\\\"Refreshing queries...\\\")\\n enqueued = []\\n@@ -84,8 +89,10 @@ def refresh_queries():\\n continue\\n \\n try:\\n+ query_text = _apply_default_parameters(query)\\n+ query_text = _apply_auto_limit(query_text, query)\\n enqueue_query(\\n- _apply_default_parameters(query),\\n+ query_text,\\n query.data_source,\\n query.user_id,\\n scheduled_query=query,\\ndiff --git a/redash/utils/__init__.py b/redash/utils/__init__.py\\nindex 533bc96100..c0930d899c 100644\\n--- a/redash/utils/__init__.py\\n+++ b/redash/utils/__init__.py\\n@@ -13,6 +13,7 @@\\n import pystache\\n import pytz\\n import simplejson\\n+import sqlparse\\n from flask import current_app\\n from funcy import select_values\\n from redash import settings\\n@@ -70,8 +71,8 @@ def generate_token(length):\\n \\n class JSONEncoder(simplejson.JSONEncoder):\\n \\\"\\\"\\\"Adapter for `simplejson.dumps`.\\\"\\\"\\\"\\n- \\n- \\n+\\n+\\n def default(self, o):\\n # Some SQLAlchemy collections are lazy.\\n if isinstance(o, Query):\\n@@ -213,3 +214,32 @@ def render_template(path, context):\\n function decorated with the `context_processor` decorator, which is not explicitly required for rendering purposes.\\n \\\"\\\"\\\"\\n current_app.jinja_env.get_template(path).render(**context)\\n+\\n+def query_is_select_no_limit(query):\\n+ parsed_query = sqlparse.parse(query)[0]\\n+ last_keyword_idx = find_last_keyword_idx(parsed_query)\\n+ # Either invalid query or query that is not select\\n+ if last_keyword_idx == -1 or parsed_query.tokens[0].value.upper() != \\\"SELECT\\\":\\n+ return False\\n+\\n+ no_limit = parsed_query.tokens[last_keyword_idx].value.upper() != \\\"LIMIT\\\" \\\\\\n+ and parsed_query.tokens[last_keyword_idx].value.upper() != \\\"OFFSET\\\"\\n+ return no_limit\\n+\\n+def find_last_keyword_idx(parsed_query):\\n+ for i in reversed(range(len(parsed_query.tokens))):\\n+ if parsed_query.tokens[i].ttype in sqlparse.tokens.Keyword:\\n+ return i\\n+ return -1\\n+\\n+def add_limit_to_query(query):\\n+ # this function will only be called if query_is_select_no_limit returns True\\n+ parsed_query = sqlparse.parse(query)[0]\\n+ limit_tokens = sqlparse.parse(\\\" LIMIT 1000\\\")[0].tokens\\n+ length = len(parsed_query.tokens)\\n+ if parsed_query.tokens[length - 1].ttype == sqlparse.tokens.Punctuation:\\n+ parsed_query.tokens[length - 1:length - 1] = limit_tokens\\n+ else:\\n+ parsed_query.tokens += limit_tokens\\n+ return str(parsed_query)\\n+\\ndiff --git a/tests/handlers/test_query_results.py b/tests/handlers/test_query_results.py\\nindex 57a9e3dbc7..be448d51d5 100644\\n--- a/tests/handlers/test_query_results.py\\n+++ b/tests/handlers/test_query_results.py\\n@@ -1,3 +1,4 @@\\n+from redash.query_runner import BaseSQLQueryRunner, BaseQueryRunner\\n from tests import BaseTestCase\\n \\n from redash.models import db\\n@@ -39,7 +40,7 @@ def test_supports_unicode(self):\\n try:\\n rv.headers['Content-Disposition'].encode('ascii')\\n except Exception as e:\\n- self.fail(repr(e)) \\n+ self.fail(repr(e))\\n \\n \\n class TestQueryResultListAPI(BaseTestCase):\\n@@ -76,6 +77,47 @@ def test_execute_new_query(self):\\n self.assertNotIn(\\\"query_result\\\", rv.json)\\n self.assertIn(\\\"job\\\", rv.json)\\n \\n+ def test_add_limit_change_query_sql(self):\\n+ ds = self.factory.create_data_source(\\n+ group=self.factory.org.default_group, type=\\\"databricks\\\"\\n+ )\\n+ query = self.factory.create_query(query_text=\\\"SELECT 2\\\", data_source=ds)\\n+ query_result = self.factory.create_query_result(data_source=ds, query_hash=query.query_hash)\\n+\\n+ rv = self.make_request(\\n+ \\\"post\\\",\\n+ \\\"/api/query_results\\\",\\n+ data={\\n+ \\\"data_source_id\\\": ds.id,\\n+ \\\"query\\\": query.query_text,\\n+ \\\"apply_auto_limit\\\": True\\n+ },\\n+ )\\n+\\n+ self.assertEqual(rv.status_code, 200)\\n+ self.assertNotIn(\\\"query_result\\\", rv.json)\\n+ self.assertIn(\\\"job\\\", rv.json)\\n+\\n+ def test_add_limit_no_change_for_nonsql(self):\\n+ ds = self.factory.create_data_source(\\n+ group=self.factory.org.default_group, type=\\\"druid\\\"\\n+ )\\n+ query = self.factory.create_query(query_text=\\\"SELECT 5\\\", data_source=ds)\\n+ query_result = self.factory.create_query_result(data_source=ds, query_hash=query.query_hash)\\n+\\n+ rv = self.make_request(\\n+ \\\"post\\\",\\n+ \\\"/api/query_results\\\",\\n+ data={\\n+ \\\"data_source_id\\\": ds.id,\\n+ \\\"query\\\": query.query_text,\\n+ \\\"apply_auto_limit\\\": True\\n+ },\\n+ )\\n+\\n+ self.assertEqual(rv.status_code, 200)\\n+ self.assertEqual(query_result.id, rv.json[\\\"query_result\\\"][\\\"id\\\"])\\n+\\n def test_execute_query_without_access(self):\\n group = self.factory.create_group()\\n db.session.commit()\\ndiff --git a/tests/query_runner/test_basesql_queryrunner.py b/tests/query_runner/test_basesql_queryrunner.py\\nnew file mode 100644\\nindex 0000000000..2a76277d1c\\n--- /dev/null\\n+++ b/tests/query_runner/test_basesql_queryrunner.py\\n@@ -0,0 +1,88 @@\\n+import unittest\\n+\\n+from redash.query_runner import BaseSQLQueryRunner, BaseQueryRunner\\n+\\n+\\n+class TestBaseSQLQueryRunner(unittest.TestCase):\\n+\\n+ def setUp(self):\\n+ self.query_runner = BaseSQLQueryRunner({})\\n+\\n+ def test_apply_auto_limit_origin_no_limit_1(self):\\n+ origin_query_text = \\\"SELECT 2\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(\\\"SELECT 2 LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_origin_have_limit_1(self):\\n+ origin_query_text = \\\"SELECT 2 LIMIT 100\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text, query_text)\\n+\\n+ def test_apply_auto_limit_origin_have_limit_2(self):\\n+ origin_query_text = \\\"SELECT * FROM fake WHERE id IN (SELECT id FROM fake_2 LIMIT 200) LIMIT 200\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text, query_text)\\n+\\n+ def test_apply_auto_limit_origin_no_limit_2(self):\\n+ origin_query_text = \\\"SELECT * FROM fake WHERE id IN (SELECT id FROM fake_2 LIMIT 200)\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text + \\\" LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_non_select_query(self):\\n+ origin_query_text = (\\\"create table execution_times as \\\"\\n+ \\\"(select id, retrieved_at, data_source_id, query, runtime, query_hash \\\"\\n+ \\\"from query_results order by 1 desc)\\\")\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text, query_text)\\n+\\n+ def test_apply_auto_limit_error_query(self):\\n+ origin_query_text = \\\"dklsk jdhsajhdiwc kkdsakjdwi mdklsjal\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text, query_text)\\n+\\n+ def test_apply_auto_limit_multi_query_add_limit_1(self):\\n+ origin_query_text = (\\\"insert into execution_times (id, retrieved_at, data_source_id, query, runtime, query_hash) \\\"\\n+ \\\"select id, retrieved_at, data_source_id, query, runtime, query_hash from query_results \\\"\\n+ \\\"where id > (select max(id) from execution_times);\\\\n\\\"\\n+ \\\"select max(id), 'execution_times' as table_name from execution_times \\\"\\n+ \\\"union all \\\"\\n+ \\\"select max(id), 'query_results' as table_name from query_results\\\")\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text + \\\" LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_multi_query_add_limit_2(self):\\n+ origin_query_text = \\\"use database demo;\\\\n\\\" \\\\\\n+ \\\"select * from data\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text + \\\" LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_multi_query_end_with_punc(self):\\n+ origin_query_text = (\\\"select * from table1;\\\\n\\\"\\n+ \\\"select * from table2\\\")\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(\\\"select * from table1;\\\\nselect * from table2 LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_multi_query_last_not_select(self):\\n+ origin_query_text = (\\\"select * from table1;\\\\n\\\"\\n+ \\\"CREATE TABLE Persons (PersonID int)\\\")\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(origin_query_text, query_text)\\n+\\n+ def test_apply_auto_limit_last_command_comment(self):\\n+ origin_query_text = \\\"select * from raw_events; # comment\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(\\\"select * from raw_events LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_last_command_comment_2(self):\\n+ origin_query_text = \\\"select * from raw_events; -- comment\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(\\\"select * from raw_events LIMIT 1000\\\", query_text)\\n+\\n+ def test_apply_auto_limit_inline_comment(self):\\n+ origin_query_text = \\\"select * from raw_events -- comment\\\"\\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\\n+ self.assertEqual(\\\"select * from raw_events LIMIT 1000\\\", query_text)\\n+\\n+\\n+if __name__ == '__main__':\\n+ unittest.main()\\ndiff --git a/tests/tasks/test_refresh_queries.py b/tests/tasks/test_refresh_queries.py\\nindex 452c1b7702..918421d74c 100644\\n--- a/tests/tasks/test_refresh_queries.py\\n+++ b/tests/tasks/test_refresh_queries.py\\n@@ -7,14 +7,15 @@\\n \\n \\n class TestRefreshQuery(BaseTestCase):\\n- def test_enqueues_outdated_queries(self):\\n+ def test_enqueues_outdated_queries_for_sqlquery(self):\\n \\\"\\\"\\\"\\n refresh_queries() launches an execution task for each query returned\\n from Query.outdated_queries().\\n \\\"\\\"\\\"\\n- query1 = self.factory.create_query()\\n+ query1 = self.factory.create_query(options={\\\"apply_auto_limit\\\": True})\\n query2 = self.factory.create_query(\\n- query_text=\\\"select 42;\\\", data_source=self.factory.create_data_source()\\n+ query_text=\\\"select 42;\\\", data_source=self.factory.create_data_source(),\\n+ options={\\\"apply_auto_limit\\\": True}\\n )\\n oq = staticmethod(lambda: [query1, query2])\\n with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\\n@@ -25,12 +26,50 @@ def test_enqueues_outdated_queries(self):\\n add_job_mock.assert_has_calls(\\n [\\n call(\\n- query1.query_text,\\n+ query1.query_text + \\\" LIMIT 1000\\\",\\n query1.data_source,\\n query1.user_id,\\n scheduled_query=query1,\\n metadata=ANY,\\n ),\\n+ call(\\n+ \\\"select 42 LIMIT 1000\\\",\\n+ query2.data_source,\\n+ query2.user_id,\\n+ scheduled_query=query2,\\n+ metadata=ANY,\\n+ ),\\n+ ],\\n+ any_order=True,\\n+ )\\n+\\n+ def test_enqueues_outdated_queries_for_non_sqlquery(self):\\n+ \\\"\\\"\\\"\\n+ refresh_queries() launches an execution task for each query returned\\n+ from Query.outdated_queries().\\n+ \\\"\\\"\\\"\\n+ ds = self.factory.create_data_source(\\n+ group=self.factory.org.default_group, type=\\\"phoenix\\\"\\n+ )\\n+ query1 = self.factory.create_query(data_source=ds, options={\\\"apply_auto_limit\\\": True})\\n+ query2 = self.factory.create_query(\\n+ query_text=\\\"select 42;\\\", data_source=ds, options={\\\"apply_auto_limit\\\": True}\\n+ )\\n+ oq = staticmethod(lambda: [query1, query2])\\n+ with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\\n+ Query, \\\"outdated_queries\\\", oq\\n+ ):\\n+ refresh_queries()\\n+ self.assertEqual(add_job_mock.call_count, 2)\\n+ add_job_mock.assert_has_calls(\\n+ [\\n+ call(\\n+ query1.query_text,\\n+ query1.data_source,\\n+ query1.user_id,\\n+ scheduled_query=query1,\\n+ metadata=ANY,\\n+ ),\\n call(\\n query2.query_text,\\n query2.data_source,\\n@@ -42,12 +81,12 @@ def test_enqueues_outdated_queries(self):\\n any_order=True,\\n )\\n \\n- def test_doesnt_enqueue_outdated_queries_for_paused_data_source(self):\\n+ def test_doesnt_enqueue_outdated_queries_for_paused_data_source_for_sqlquery(self):\\n \\\"\\\"\\\"\\n refresh_queries() does not launch execution tasks for queries whose\\n data source is paused.\\n \\\"\\\"\\\"\\n- query = self.factory.create_query()\\n+ query = self.factory.create_query(options={\\\"apply_auto_limit\\\": True})\\n oq = staticmethod(lambda: [query])\\n query.data_source.pause()\\n with patch.object(Query, \\\"outdated_queries\\\", oq):\\n@@ -60,14 +99,42 @@ def test_doesnt_enqueue_outdated_queries_for_paused_data_source(self):\\n with patch(ENQUEUE_QUERY) as add_job_mock:\\n refresh_queries()\\n add_job_mock.assert_called_with(\\n- query.query_text,\\n+ query.query_text + \\\" LIMIT 1000\\\",\\n query.data_source,\\n query.user_id,\\n scheduled_query=query,\\n metadata=ANY,\\n )\\n \\n- def test_enqueues_parameterized_queries(self):\\n+ def test_doesnt_enqueue_outdated_queries_for_paused_data_source_for_non_sqlquery(self):\\n+ \\\"\\\"\\\"\\n+ refresh_queries() does not launch execution tasks for queries whose\\n+ data source is paused.\\n+ \\\"\\\"\\\"\\n+ ds = self.factory.create_data_source(\\n+ group=self.factory.org.default_group, type=\\\"phoenix\\\"\\n+ )\\n+ query = self.factory.create_query(data_source=ds, options={\\\"apply_auto_limit\\\": True})\\n+ oq = staticmethod(lambda: [query])\\n+ query.data_source.pause()\\n+ with patch.object(Query, \\\"outdated_queries\\\", oq):\\n+ with patch(ENQUEUE_QUERY) as add_job_mock:\\n+ refresh_queries()\\n+ add_job_mock.assert_not_called()\\n+\\n+ query.data_source.resume()\\n+\\n+ with patch(ENQUEUE_QUERY) as add_job_mock:\\n+ refresh_queries()\\n+ add_job_mock.assert_called_with(\\n+ query.query_text,\\n+ query.data_source,\\n+ query.user_id,\\n+ scheduled_query=query,\\n+ metadata=ANY,\\n+ )\\n+\\n+ def test_enqueues_parameterized_queries_for_sqlquery(self):\\n \\\"\\\"\\\"\\n Scheduled queries with parameters use saved values.\\n \\\"\\\"\\\"\\n@@ -82,10 +149,48 @@ def test_enqueues_parameterized_queries(self):\\n \\\"value\\\": \\\"42\\\",\\n \\\"title\\\": \\\"n\\\",\\n }\\n- ]\\n+ ],\\n+ \\\"apply_auto_limit\\\": True\\n },\\n )\\n oq = staticmethod(lambda: [query])\\n+ with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\\n+ Query, \\\"outdated_queries\\\", oq\\n+ ):\\n+ refresh_queries()\\n+ add_job_mock.assert_called_with(\\n+ \\\"select 42 LIMIT 1000\\\",\\n+ query.data_source,\\n+ query.user_id,\\n+ scheduled_query=query,\\n+ metadata=ANY,\\n+ )\\n+\\n+ def test_enqueues_parameterized_queries_for_non_sqlquery(self):\\n+ \\\"\\\"\\\"\\n+ Scheduled queries with parameters use saved values.\\n+ \\\"\\\"\\\"\\n+ ds = self.factory.create_data_source(\\n+ group=self.factory.org.default_group, type=\\\"phoenix\\\"\\n+ )\\n+ query = self.factory.create_query(\\n+ query_text=\\\"select {{n}}\\\",\\n+ options={\\n+ \\\"parameters\\\": [\\n+ {\\n+ \\\"global\\\": False,\\n+ \\\"type\\\": \\\"text\\\",\\n+ \\\"name\\\": \\\"n\\\",\\n+ \\\"value\\\": \\\"42\\\",\\n+ \\\"title\\\": \\\"n\\\",\\n+ }\\n+ ],\\n+ \\\"apply_auto_limit\\\": True\\n+\\n+ },\\n+ data_source=ds,\\n+ )\\n+ oq = staticmethod(lambda: [query])\\n with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\\n Query, \\\"outdated_queries\\\", oq\\n ):\\n@@ -113,7 +218,8 @@ def test_doesnt_enqueue_parameterized_queries_with_invalid_parameters(self):\\n \\\"value\\\": 42, # <-- should be text!\\n \\\"title\\\": \\\"n\\\",\\n }\\n- ]\\n+ ],\\n+ \\\"apply_auto_limit\\\": True\\n },\\n )\\n oq = staticmethod(lambda: [query])\\n@@ -140,7 +246,8 @@ def test_doesnt_enqueue_parameterized_queries_with_dropdown_queries_that_are_det\\n \\\"queryId\\\": 100,\\n \\\"title\\\": \\\"n\\\",\\n }\\n- ]\\n+ ],\\n+ \\\"apply_auto_limit\\\": True\\n },\\n )\\n \\ndiff --git a/tests/utils/test_query_limit.py b/tests/utils/test_query_limit.py\\nnew file mode 100644\\nindex 0000000000..089d5592f1\\n--- /dev/null\\n+++ b/tests/utils/test_query_limit.py\\n@@ -0,0 +1,41 @@\\n+import unittest\\n+\\n+from redash.utils import query_is_select_no_limit, add_limit_to_query\\n+\\n+\\n+class TestQueryLimit(unittest.TestCase):\\n+ def test_check_query_limit_no_limit(self):\\n+ query = \\\"SELECT *\\\"\\n+ self.assertEqual(True, query_is_select_no_limit(query))\\n+\\n+ def test_check_query_limit_non_select(self):\\n+ query = \\\"Create Table (PersonID INT)\\\"\\n+ self.assertEqual(False, query_is_select_no_limit(query))\\n+\\n+ def test_check_query_limit_invalid_1(self):\\n+ query = \\\"OFFSET 5\\\"\\n+ self.assertEqual(False, query_is_select_no_limit(query))\\n+\\n+ def test_check_query_limit_invalid_2(self):\\n+ query = \\\"TABLE A FROM TABLE B\\\"\\n+ self.assertEqual(False, query_is_select_no_limit(query))\\n+\\n+ def test_check_query_with_limit(self):\\n+ query = \\\"SELECT * LIMIT 5\\\"\\n+ self.assertEqual(False, query_is_select_no_limit(query))\\n+\\n+ def test_check_query_with_offset(self):\\n+ query = \\\"SELECT * LIMIT 5 OFFSET 3\\\"\\n+ self.assertEqual(False, query_is_select_no_limit(query))\\n+\\n+ def test_add_limit_query_no_limit(self):\\n+ query = \\\"SELECT *\\\"\\n+ self.assertEqual(\\\"SELECT * LIMIT 1000\\\", add_limit_to_query(query))\\n+\\n+ def test_add_limit_query_with_punc(self):\\n+ query = \\\"SELECT *;\\\"\\n+ self.assertEqual(\\\"SELECT * LIMIT 1000;\\\", add_limit_to_query(query))\\n+\\n+\\n+if __name__ == '__main__':\\n+ unittest.main()\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -865,10 +867,14 @@ def dashboard_api_keys(self):\n return [api_key[0] for api_key in api_keys]\n \n \n-@listens_for(Query.query_text, \"set\")\n-def gen_query_hash(target, val, oldval, initiator):\n- target.query_hash = utils.gen_query_hash(val)\n- target.schedule_failures = 0\n+@listens_for(Query, \"before_insert\")","line":null,"original_line":870,"original_start_line":null,"path":"redash/models/__init__.py","start_line":null,"text":"@user2:\nI'm pretty sure you can apply both decorator to a single method:\r\n\r\n```python\r\n@user1(Query, \"before_insert\")\r\n@user1(Query, \"before_update\")\r\ndef update_query_hash(...):\r\n ...\r\n```"},{"diff_hunk":"@@ -122,6 +123,7 @@ def to_dict(self, all=False, with_permissions_for=None):\n \"syntax\": self.query_runner.syntax,\n \"paused\": self.paused,\n \"pause_reason\": self.pause_reason,\n+ \"apply_auto_limit\": self.query_runner.supports_auto_limit","line":null,"original_line":125,"original_start_line":null,"path":"redash/models/__init__.py","start_line":null,"text":"@user1:\n```suggestion\r\n \"supports_auto_limit\": self.query_runner.supports_auto_limit\r\n```\r\n\r\nThis should be `supports_auto_limit` too. \r\n\r\nSorry for the nits, it just that these things are very hard to change later."},{"diff_hunk":"@@ -0,0 +1,24 @@\n+import { useCallback, useState } from \"react\";\n+import localOptions from \"@/lib/localOptions\";\n+import { get, extend } from \"lodash\";\n+\n+function isAutoLimitAvailable(dataSource) {\n+ return get(dataSource, \"apply_auto_limit\", false);\n+}\n+\n+export default function useAutoLimitFlags(dataSource, query, setQuery) {\n+ const isAvailable = isAutoLimitAvailable(dataSource);\n+ const [isChecked, setIsChecked] = useState(localOptions.get(\"applyAutoLimit\", true));\n+ query.options.applyAutoLimit = isAvailable && isChecked;","line":null,"original_line":12,"original_start_line":null,"path":"client/app/pages/queries/hooks/useAutoLimitFlags.js","start_line":null,"text":"@user1:\nIs this to guarantee the `applyAutoLimit` is set to false when not available? If so, how about we put this line into a\r\n\r\n```jsx\r\nuseEffect(() => {\r\n query.options.applyAutoLimit = isAvailable && isChecked;\r\n}, [isAvailable, isChecked]);\r\n```\r\n? This way it will update that value only when one the vars change and not on every render.\n\n@user2:\nMaybe I'm missing something, but it's a simple operation between two boolean values which most of the time yields the same value (so no change in rendering). Why complicate the code with a `useEffect`?\n\n@user1:\nI thought it mostly not to be reassigning a value uneedlessly, it just felt a bit weird to mutate such value on every re-render, so my take was to limit it with `useEffect`. It is a boolean value, so it won't trigger any rerender indeed, it's more on the case it was updated out of this hook's context. Which thinking now, doesn't happen 😅\n\n\n\n@user2:\n:-)\r\n\r\nWe need to be careful with such optimizations, because in this case it's likely making the code less optimized (instead of boolean assignment, we get functions calls, function definitions, etc) but what's even worse is that makes the code less readable."}],"string":"[\n {\n \"diff_hunk\": \"@@ -865,10 +867,14 @@ def dashboard_api_keys(self):\\n return [api_key[0] for api_key in api_keys]\\n \\n \\n-@listens_for(Query.query_text, \\\"set\\\")\\n-def gen_query_hash(target, val, oldval, initiator):\\n- target.query_hash = utils.gen_query_hash(val)\\n- target.schedule_failures = 0\\n+@listens_for(Query, \\\"before_insert\\\")\",\n \"line\": null,\n \"original_line\": 870,\n \"original_start_line\": null,\n \"path\": \"redash/models/__init__.py\",\n \"start_line\": null,\n \"text\": \"@user2:\\nI'm pretty sure you can apply both decorator to a single method:\\r\\n\\r\\n```python\\r\\n@user1(Query, \\\"before_insert\\\")\\r\\n@user1(Query, \\\"before_update\\\")\\r\\ndef update_query_hash(...):\\r\\n ...\\r\\n```\"\n },\n {\n \"diff_hunk\": \"@@ -122,6 +123,7 @@ def to_dict(self, all=False, with_permissions_for=None):\\n \\\"syntax\\\": self.query_runner.syntax,\\n \\\"paused\\\": self.paused,\\n \\\"pause_reason\\\": self.pause_reason,\\n+ \\\"apply_auto_limit\\\": self.query_runner.supports_auto_limit\",\n \"line\": null,\n \"original_line\": 125,\n \"original_start_line\": null,\n \"path\": \"redash/models/__init__.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\n```suggestion\\r\\n \\\"supports_auto_limit\\\": self.query_runner.supports_auto_limit\\r\\n```\\r\\n\\r\\nThis should be `supports_auto_limit` too. \\r\\n\\r\\nSorry for the nits, it just that these things are very hard to change later.\"\n },\n {\n \"diff_hunk\": \"@@ -0,0 +1,24 @@\\n+import { useCallback, useState } from \\\"react\\\";\\n+import localOptions from \\\"@/lib/localOptions\\\";\\n+import { get, extend } from \\\"lodash\\\";\\n+\\n+function isAutoLimitAvailable(dataSource) {\\n+ return get(dataSource, \\\"apply_auto_limit\\\", false);\\n+}\\n+\\n+export default function useAutoLimitFlags(dataSource, query, setQuery) {\\n+ const isAvailable = isAutoLimitAvailable(dataSource);\\n+ const [isChecked, setIsChecked] = useState(localOptions.get(\\\"applyAutoLimit\\\", true));\\n+ query.options.applyAutoLimit = isAvailable && isChecked;\",\n \"line\": null,\n \"original_line\": 12,\n \"original_start_line\": null,\n \"path\": \"client/app/pages/queries/hooks/useAutoLimitFlags.js\",\n \"start_line\": null,\n \"text\": \"@user1:\\nIs this to guarantee the `applyAutoLimit` is set to false when not available? If so, how about we put this line into a\\r\\n\\r\\n```jsx\\r\\nuseEffect(() => {\\r\\n query.options.applyAutoLimit = isAvailable && isChecked;\\r\\n}, [isAvailable, isChecked]);\\r\\n```\\r\\n? This way it will update that value only when one the vars change and not on every render.\\n\\n@user2:\\nMaybe I'm missing something, but it's a simple operation between two boolean values which most of the time yields the same value (so no change in rendering). Why complicate the code with a `useEffect`?\\n\\n@user1:\\nI thought it mostly not to be reassigning a value uneedlessly, it just felt a bit weird to mutate such value on every re-render, so my take was to limit it with `useEffect`. It is a boolean value, so it won't trigger any rerender indeed, it's more on the case it was updated out of this hook's context. Which thinking now, doesn't happen 😅\\n\\n\\n\\n@user2:\\n:-)\\r\\n\\r\\nWe need to be careful with such optimizations, because in this case it's likely making the code less optimized (instead of boolean assignment, we get functions calls, function definitions, etc) but what's even worse is that makes the code less readable.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"361308cb10d33d45f11e02925643f84247c896dc"},"merged_patch":{"kind":"string","value":"diff --git a/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx\nnew file mode 100644\nindex 0000000000..4ac0330299\n--- /dev/null\n+++ b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx\n@@ -0,0 +1,37 @@\n+import React, { useCallback } from \"react\";\n+import PropTypes from \"prop-types\";\n+import recordEvent from \"@/services/recordEvent\";\n+import Checkbox from \"antd/lib/checkbox\";\n+import Tooltip from \"antd/lib/tooltip\";\n+\n+export default function AutoLimitCheckbox({ available, checked, onChange }) {\n+ const handleClick = useCallback(() => {\n+ recordEvent(\"checkbox_auto_limit\", \"screen\", \"query_editor\", { state: !checked });\n+ onChange(!checked);\n+ }, [checked, onChange]);\n+\n+ let tooltipMessage = null;\n+ if (!available) {\n+ tooltipMessage = \"Auto limiting is not available for this Data Source type.\";\n+ } else {\n+ tooltipMessage = \"Auto limit results to first 1000 rows.\";\n+ }\n+\n+ return (\n+ <Tooltip placement=\"top\" title={tooltipMessage}>\n+ <Checkbox\n+ className=\"query-editor-controls-checkbox\"\n+ disabled={!available}\n+ onClick={handleClick}\n+ checked={available && checked}>\n+ LIMIT 1000\n+ </Checkbox>\n+ </Tooltip>\n+ );\n+}\n+\n+AutoLimitCheckbox.propTypes = {\n+ available: PropTypes.bool,\n+ checked: PropTypes.bool.isRequired,\n+ onChange: PropTypes.func.isRequired,\n+};\ndiff --git a/client/app/components/queries/QueryEditor/QueryEditorControls.jsx b/client/app/components/queries/QueryEditor/QueryEditorControls.jsx\nindex cf02c8535e..c643debf8f 100644\n--- a/client/app/components/queries/QueryEditor/QueryEditorControls.jsx\n+++ b/client/app/components/queries/QueryEditor/QueryEditorControls.jsx\n@@ -8,6 +8,7 @@ import KeyboardShortcuts, { humanReadableShortcut } from \"@/services/KeyboardSho\n \n import AutocompleteToggle from \"./AutocompleteToggle\";\n import \"./QueryEditorControls.less\";\n+import AutoLimitCheckbox from \"@/components/queries/QueryEditor/AutoLimitCheckbox\";\n \n export function ButtonTooltip({ title, shortcut, ...props }) {\n shortcut = humanReadableShortcut(shortcut, 1); // show only primary shortcut\n@@ -38,6 +39,7 @@ export default function EditorControl({\n saveButtonProps,\n executeButtonProps,\n autocompleteToggleProps,\n+ autoLimitCheckboxProps,\n dataSourceSelectorProps,\n }) {\n useEffect(() => {\n@@ -84,6 +86,7 @@ export default function EditorControl({\n onToggle={autocompleteToggleProps.onToggle}\n />\n )}\n+ {autoLimitCheckboxProps !== false && <AutoLimitCheckbox {...autoLimitCheckboxProps} />}\n {dataSourceSelectorProps === false && <span className=\"query-editor-controls-spacer\" />}\n {dataSourceSelectorProps !== false && (\n <Select\n@@ -153,6 +156,10 @@ EditorControl.propTypes = {\n onToggle: PropTypes.func,\n }),\n ]),\n+ autoLimitCheckboxProps: PropTypes.oneOfType([\n+ PropTypes.bool, // `false` to hide\n+ PropTypes.shape(AutoLimitCheckbox.propTypes),\n+ ]),\n dataSourceSelectorProps: PropTypes.oneOfType([\n PropTypes.bool, // `false` to hide\n PropTypes.shape({\n@@ -175,5 +182,6 @@ EditorControl.defaultProps = {\n saveButtonProps: false,\n executeButtonProps: false,\n autocompleteToggleProps: false,\n+ autoLimitCheckboxProps: false,\n dataSourceSelectorProps: false,\n };\ndiff --git a/client/app/components/queries/QueryEditor/QueryEditorControls.less b/client/app/components/queries/QueryEditor/QueryEditorControls.less\nindex f81c152ae5..118698dc79 100644\n--- a/client/app/components/queries/QueryEditor/QueryEditorControls.less\n+++ b/client/app/components/queries/QueryEditor/QueryEditorControls.less\n@@ -21,6 +21,12 @@\n }\n }\n \n+ .query-editor-controls-checkbox {\n+ display: inline-block;\n+ white-space: nowrap;\n+ margin: auto 5px;\n+ }\n+\n .query-editor-controls-spacer {\n flex: 1 1 auto;\n height: 35px; // same as Antd <Select>\ndiff --git a/client/app/pages/queries/QuerySource.jsx b/client/app/pages/queries/QuerySource.jsx\nindex 2f97c50662..48473d886c 100644\n--- a/client/app/pages/queries/QuerySource.jsx\n+++ b/client/app/pages/queries/QuerySource.jsx\n@@ -26,6 +26,7 @@ import { getEditorComponents } from \"@/components/queries/editor-components\";\n import useQuery from \"./hooks/useQuery\";\n import useVisualizationTabHandler from \"./hooks/useVisualizationTabHandler\";\n import useAutocompleteFlags from \"./hooks/useAutocompleteFlags\";\n+import useAutoLimitFlags from \"./hooks/useAutoLimitFlags\";\n import useQueryExecute from \"./hooks/useQueryExecute\";\n import useQueryResultData from \"@/lib/useQueryResultData\";\n import useQueryDataSources from \"./hooks/useQueryDataSources\";\n@@ -77,6 +78,7 @@ function QuerySource(props) {\n \n const editorRef = useRef(null);\n const [autocompleteAvailable, autocompleteEnabled, toggleAutocomplete] = useAutocompleteFlags(schema);\n+ const [autoLimitAvailable, autoLimitChecked, setAutoLimit] = useAutoLimitFlags(dataSource, query, setQuery);\n \n const [handleQueryEditorChange] = useDebouncedCallback(queryText => {\n setQuery(extend(query.clone(), { query: queryText }));\n@@ -306,6 +308,11 @@ function QuerySource(props) {\n enabled: autocompleteEnabled,\n onToggle: toggleAutocomplete,\n }}\n+ autoLimitCheckboxProps={{\n+ available: autoLimitAvailable,\n+ checked: autoLimitChecked,\n+ onChange: setAutoLimit,\n+ }}\n dataSourceSelectorProps={\n dataSource\n ? {\ndiff --git a/client/app/pages/queries/hooks/useAutoLimitFlags.js b/client/app/pages/queries/hooks/useAutoLimitFlags.js\nnew file mode 100644\nindex 0000000000..37b3b50143\n--- /dev/null\n+++ b/client/app/pages/queries/hooks/useAutoLimitFlags.js\n@@ -0,0 +1,24 @@\n+import { useCallback, useState } from \"react\";\n+import localOptions from \"@/lib/localOptions\";\n+import { get, extend } from \"lodash\";\n+\n+function isAutoLimitAvailable(dataSource) {\n+ return get(dataSource, \"supports_auto_limit\", false);\n+}\n+\n+export default function useAutoLimitFlags(dataSource, query, setQuery) {\n+ const isAvailable = isAutoLimitAvailable(dataSource);\n+ const [isChecked, setIsChecked] = useState(localOptions.get(\"applyAutoLimit\", true));\n+ query.options.apply_auto_limit = isAvailable && isChecked;\n+\n+ const setAutoLimit = useCallback(\n+ state => {\n+ setIsChecked(state);\n+ localOptions.set(\"applyAutoLimit\", state);\n+ setQuery(extend(query.clone(), { options: { ...query.options, apply_auto_limit: isAvailable && state } }));\n+ },\n+ [query, setQuery, isAvailable]\n+ );\n+\n+ return [isAvailable, isChecked, setAutoLimit];\n+}\ndiff --git a/client/app/services/query-result.js b/client/app/services/query-result.js\nindex 0f39778c0c..dc4874da86 100644\n--- a/client/app/services/query-result.js\n+++ b/client/app/services/query-result.js\n@@ -435,11 +435,11 @@ class QueryResult {\n return `${queryName.replace(/ /g, \"_\") + moment(this.getUpdatedAt()).format(\"_YYYY_MM_DD\")}.${fileType}`;\n }\n \n- static getByQueryId(id, parameters, maxAge) {\n+ static getByQueryId(id, parameters, applyAutoLimit, maxAge) {\n const queryResult = new QueryResult();\n \n axios\n- .post(`api/queries/${id}/results`, { id, parameters, max_age: maxAge })\n+ .post(`api/queries/${id}/results`, { id, parameters, apply_auto_limit: applyAutoLimit, max_age: maxAge })\n .then(response => {\n queryResult.update(response);\n \n@@ -454,13 +454,14 @@ class QueryResult {\n return queryResult;\n }\n \n- static get(dataSourceId, query, parameters, maxAge, queryId) {\n+ static get(dataSourceId, query, parameters, applyAutoLimit, maxAge, queryId) {\n const queryResult = new QueryResult();\n \n const params = {\n data_source_id: dataSourceId,\n parameters,\n query,\n+ apply_auto_limit: applyAutoLimit,\n max_age: maxAge,\n };\n \ndiff --git a/client/app/services/query.js b/client/app/services/query.js\nindex 66ba2be6b8..368152a7da 100644\n--- a/client/app/services/query.js\n+++ b/client/app/services/query.js\n@@ -130,7 +130,8 @@ export class Query {\n }\n \n getQueryResult(maxAge) {\n- const execute = () => QueryResult.getByQueryId(this.id, this.getParameters().getExecutionValues(), maxAge);\n+ const execute = () =>\n+ QueryResult.getByQueryId(this.id, this.getParameters().getExecutionValues(), this.getAutoLimit(), maxAge);\n return this.prepareQueryResultExecution(execute, maxAge);\n }\n \n@@ -141,7 +142,8 @@ export class Query {\n }\n \n const parameters = this.getParameters().getExecutionValues({ joinListValues: true });\n- const execute = () => QueryResult.get(this.data_source_id, queryText, parameters, maxAge, this.id);\n+ const execute = () =>\n+ QueryResult.get(this.data_source_id, queryText, parameters, this.getAutoLimit(), maxAge, this.id);\n return this.prepareQueryResultExecution(execute, maxAge);\n }\n \n@@ -184,6 +186,10 @@ export class Query {\n return this.$parameters;\n }\n \n+ getAutoLimit() {\n+ return this.options.apply_auto_limit;\n+ }\n+\n getParametersDefs(update = true) {\n return this.getParameters().get(update);\n }\ndiff --git a/redash/handlers/queries.py b/redash/handlers/queries.py\nindex 5511d43a3e..169807048e 100644\n--- a/redash/handlers/queries.py\n+++ b/redash/handlers/queries.py\n@@ -488,9 +488,9 @@ def post(self, query_id):\n \n parameter_values = collect_parameters_from_request(request.args)\n parameterized_query = ParameterizedQuery(query.query_text, org=self.current_org)\n-\n+ should_apply_auto_limit = query.options.get(\"apply_auto_limit\", False)\n return run_query(\n- parameterized_query, parameter_values, query.data_source, query.id\n+ parameterized_query, parameter_values, query.data_source, query.id, should_apply_auto_limit\n )\n \n \ndiff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py\nindex 4b9e189cce..e34d730141 100644\n--- a/redash/handlers/query_results.py\n+++ b/redash/handlers/query_results.py\n@@ -20,7 +20,6 @@\n from redash.tasks.queries import enqueue_query\n from redash.utils import (\n collect_parameters_from_request,\n- gen_query_hash,\n json_dumps,\n utcnow,\n to_filename,\n@@ -61,7 +60,7 @@ def error_response(message, http_status=400):\n }\n \n \n-def run_query(query, parameters, data_source, query_id, max_age=0):\n+def run_query(query, parameters, data_source, query_id, should_apply_auto_limit, max_age=0):\n if data_source.paused:\n if data_source.pause_reason:\n message = \"{} is paused ({}). Please try later.\".format(\n@@ -77,6 +76,8 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\n except (InvalidParameterError, QueryDetachedFromDataSourceError) as e:\n abort(400, message=str(e))\n \n+ query_text = data_source.query_runner.apply_auto_limit(query.text, should_apply_auto_limit)\n+\n if query.missing_params:\n return error_response(\n \"Missing parameter value for: {}\".format(\", \".join(query.missing_params))\n@@ -85,7 +86,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\n if max_age == 0:\n query_result = None\n else:\n- query_result = models.QueryResult.get_latest(data_source, query.text, max_age)\n+ query_result = models.QueryResult.get_latest(data_source, query_text, max_age)\n \n record_event(\n current_user.org,\n@@ -95,7 +96,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\n \"cache\": \"hit\" if query_result else \"miss\",\n \"object_id\": data_source.id,\n \"object_type\": \"data_source\",\n- \"query\": query.text,\n+ \"query\": query_text,\n \"query_id\": query_id,\n \"parameters\": parameters,\n },\n@@ -109,7 +110,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):\n }\n else:\n job = enqueue_query(\n- query.text,\n+ query_text,\n data_source,\n current_user.id,\n current_user.is_api_user(),\n@@ -180,6 +181,7 @@ def post(self):\n )\n \n parameterized_query = ParameterizedQuery(query, org=self.current_org)\n+ should_apply_auto_limit = params.get(\"apply_auto_limit\", False)\n \n data_source_id = params.get(\"data_source_id\")\n if data_source_id:\n@@ -193,7 +195,7 @@ def post(self):\n return error_messages[\"no_permission\"]\n \n return run_query(\n- parameterized_query, parameters, data_source, query_id, max_age\n+ parameterized_query, parameters, data_source, query_id, should_apply_auto_limit, max_age\n )\n \n \n@@ -286,6 +288,7 @@ def post(self, query_id):\n )\n \n allow_executing_with_view_only_permissions = query.parameterized.is_safe\n+ should_apply_auto_limit = params.get(\"apply_auto_limit\", False)\n \n if has_access(\n query, self.current_user, allow_executing_with_view_only_permissions\n@@ -295,6 +298,7 @@ def post(self, query_id):\n parameter_values,\n query.data_source,\n query_id,\n+ should_apply_auto_limit,\n max_age,\n )\n else:\ndiff --git a/redash/models/__init__.py b/redash/models/__init__.py\nindex 1d5528aaca..68f0075434 100644\n--- a/redash/models/__init__.py\n+++ b/redash/models/__init__.py\n@@ -30,7 +30,7 @@\n TYPE_BOOLEAN,\n TYPE_DATE,\n TYPE_DATETIME,\n-)\n+ BaseQueryRunner)\n from redash.utils import (\n generate_token,\n json_dumps,\n@@ -38,7 +38,7 @@\n mustache_render,\n base_url,\n sentry,\n-)\n+ gen_query_hash)\n from redash.utils.configuration import ConfigurationContainer\n from redash.models.parameterized_query import ParameterizedQuery\n \n@@ -122,6 +122,7 @@ def to_dict(self, all=False, with_permissions_for=None):\n \"syntax\": self.query_runner.syntax,\n \"paused\": self.paused,\n \"pause_reason\": self.pause_reason,\n+ \"supports_auto_limit\": self.query_runner.supports_auto_limit\n }\n \n if all:\n@@ -358,7 +359,7 @@ def unused(cls, days=7):\n \n @classmethod\n def get_latest(cls, data_source, query, max_age=0):\n- query_hash = utils.gen_query_hash(query)\n+ query_hash = gen_query_hash(query)\n \n if max_age == -1:\n query = cls.query.filter(\n@@ -864,11 +865,16 @@ def dashboard_api_keys(self):\n api_keys = db.session.execute(query, {\"id\": self.id}).fetchall()\n return [api_key[0] for api_key in api_keys]\n \n+ def update_query_hash(self):\n+ should_apply_auto_limit = self.options.get(\"apply_auto_limit\", False) if self.options else False\n+ query_runner = self.data_source.query_runner if self.data_source else BaseQueryRunner({})\n+ self.query_hash = query_runner.gen_query_hash(self.query_text, should_apply_auto_limit)\n+\n \n-@listens_for(Query.query_text, \"set\")\n-def gen_query_hash(target, val, oldval, initiator):\n- target.query_hash = utils.gen_query_hash(val)\n- target.schedule_failures = 0\n+@listens_for(Query, \"before_insert\")\n+@listens_for(Query, \"before_update\")\n+def receive_before_insert_update(mapper, connection, target):\n+ target.update_query_hash()\n \n \n @listens_for(Query.user_id, \"set\")\ndiff --git a/redash/query_runner/__init__.py b/redash/query_runner/__init__.py\nindex 9f92ffe637..66dfa6e437 100644\n--- a/redash/query_runner/__init__.py\n+++ b/redash/query_runner/__init__.py\n@@ -9,8 +9,8 @@\n \n from six import text_type\n from sshtunnel import open_tunnel\n-from redash import settings\n-from redash.utils import json_loads\n+from redash import settings, utils\n+from redash.utils import json_loads, query_is_select_no_limit, add_limit_to_query\n from rq.timeouts import JobTimeoutException\n \n from redash.utils.requests_session import requests, requests_session\n@@ -83,7 +83,7 @@ def host(self):\n \"\"\"Returns this query runner's configured host.\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\n \n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\n \"\"\"\n if \"host\" in self.configuration:\n@@ -96,7 +96,7 @@ def host(self, host):\n \"\"\"Sets this query runner's configured host.\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\n \n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\n \"\"\"\n if \"host\" in self.configuration:\n@@ -109,7 +109,7 @@ def port(self):\n \"\"\"Returns this query runner's configured port.\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\n \n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\n \"\"\"\n if \"port\" in self.configuration:\n@@ -122,7 +122,7 @@ def port(self, port):\n \"\"\"Sets this query runner's configured port.\n This is used primarily for temporarily swapping endpoints when using SSH tunnels to connect to a data source.\n \n- `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port` \n+ `BaseQueryRunner`'s naïve implementation supports query runner implementations that store endpoints using `host` and `port`\n configuration values. If your query runner uses a different schema (e.g. a web address), you should override this function.\n \"\"\"\n if \"port\" in self.configuration:\n@@ -190,6 +190,17 @@ def to_dict(cls):\n **({\"deprecated\": True} if cls.deprecated else {}),\n }\n \n+ @property\n+ def supports_auto_limit(self):\n+ return False\n+\n+ def apply_auto_limit(self, query_text, should_apply_auto_limit):\n+ return query_text\n+\n+ def gen_query_hash(self, query_text, set_auto_limit=False):\n+ query_text = self.apply_auto_limit(query_text, set_auto_limit)\n+ return utils.gen_query_hash(query_text)\n+\n \n class BaseSQLQueryRunner(BaseQueryRunner):\n def get_schema(self, get_stats=False):\n@@ -208,6 +219,22 @@ def _get_tables_stats(self, tables_dict):\n res = self._run_query_internal(\"select count(*) as cnt from %s\" % t)\n tables_dict[t][\"size\"] = res[0][\"cnt\"]\n \n+ @property\n+ def supports_auto_limit(self):\n+ return True\n+\n+ def apply_auto_limit(self, query_text, should_apply_auto_limit):\n+ if should_apply_auto_limit:\n+ from redash.query_runner.databricks import split_sql_statements, combine_sql_statements\n+ queries = split_sql_statements(query_text)\n+ # we only check for last one in the list because it is the one that we show result\n+ last_query = queries[-1]\n+ if query_is_select_no_limit(last_query):\n+ queries[-1] = add_limit_to_query(last_query)\n+ return combine_sql_statements(queries)\n+ else:\n+ return query_text\n+\n \n def is_private_address(url):\n hostname = urlparse(url).hostname\ndiff --git a/redash/query_runner/databricks.py b/redash/query_runner/databricks.py\nindex ea7e5279c1..2ce2cd9b51 100644\n--- a/redash/query_runner/databricks.py\n+++ b/redash/query_runner/databricks.py\n@@ -21,7 +21,6 @@\n except ImportError:\n enabled = False\n \n-\n TYPES_MAP = {\n str: TYPE_STRING,\n bool: TYPE_BOOLEAN,\n@@ -83,6 +82,10 @@ def is_empty_statement(stmt):\n return [\"\"] # if all statements were empty - return a single empty statement\n \n \n+def combine_sql_statements(queries):\n+ return \";\\n\".join(queries)\n+\n+\n class Databricks(BaseSQLQueryRunner):\n noop_query = \"SELECT 1\"\n should_annotate_query = False\ndiff --git a/redash/tasks/queries/maintenance.py b/redash/tasks/queries/maintenance.py\nindex c54cd05aa3..09b51bf32d 100644\n--- a/redash/tasks/queries/maintenance.py\n+++ b/redash/tasks/queries/maintenance.py\n@@ -76,6 +76,11 @@ class RefreshQueriesError(Exception):\n pass\n \n \n+def _apply_auto_limit(query_text, query):\n+ should_apply_auto_limit = query.options.get(\"apply_auto_limit\", False)\n+ return query.data_source.query_runner.apply_auto_limit(query_text, should_apply_auto_limit)\n+\n+\n def refresh_queries():\n logger.info(\"Refreshing queries...\")\n enqueued = []\n@@ -84,8 +89,10 @@ def refresh_queries():\n continue\n \n try:\n+ query_text = _apply_default_parameters(query)\n+ query_text = _apply_auto_limit(query_text, query)\n enqueue_query(\n- _apply_default_parameters(query),\n+ query_text,\n query.data_source,\n query.user_id,\n scheduled_query=query,\ndiff --git a/redash/utils/__init__.py b/redash/utils/__init__.py\nindex 533bc96100..eff3aec172 100644\n--- a/redash/utils/__init__.py\n+++ b/redash/utils/__init__.py\n@@ -13,6 +13,7 @@\n import pystache\n import pytz\n import simplejson\n+import sqlparse\n from flask import current_app\n from funcy import select_values\n from redash import settings\n@@ -20,7 +21,6 @@\n \n from .human_time import parse_human_time\n \n-\n COMMENTS_REGEX = re.compile(\"/\\*.*?\\*/\")\n WRITER_ENCODING = os.environ.get(\"REDASH_CSV_WRITER_ENCODING\", \"utf-8\")\n WRITER_ERRORS = os.environ.get(\"REDASH_CSV_WRITER_ERRORS\", \"strict\")\n@@ -70,8 +70,7 @@ def generate_token(length):\n \n class JSONEncoder(simplejson.JSONEncoder):\n \"\"\"Adapter for `simplejson.dumps`.\"\"\"\n- \n- \n+\n def default(self, o):\n # Some SQLAlchemy collections are lazy.\n if isinstance(o, Query):\n@@ -213,3 +212,33 @@ def render_template(path, context):\n function decorated with the `context_processor` decorator, which is not explicitly required for rendering purposes.\n \"\"\"\n current_app.jinja_env.get_template(path).render(**context)\n+\n+\n+def query_is_select_no_limit(query):\n+ parsed_query = sqlparse.parse(query)[0]\n+ last_keyword_idx = find_last_keyword_idx(parsed_query)\n+ # Either invalid query or query that is not select\n+ if last_keyword_idx == -1 or parsed_query.tokens[0].value.upper() != \"SELECT\":\n+ return False\n+\n+ no_limit = parsed_query.tokens[last_keyword_idx].value.upper() != \"LIMIT\" \\\n+ and parsed_query.tokens[last_keyword_idx].value.upper() != \"OFFSET\"\n+ return no_limit\n+\n+\n+def find_last_keyword_idx(parsed_query):\n+ for i in reversed(range(len(parsed_query.tokens))):\n+ if parsed_query.tokens[i].ttype in sqlparse.tokens.Keyword:\n+ return i\n+ return -1\n+\n+\n+def add_limit_to_query(query):\n+ parsed_query = sqlparse.parse(query)[0]\n+ limit_tokens = sqlparse.parse(\" LIMIT 1000\")[0].tokens\n+ length = len(parsed_query.tokens)\n+ if parsed_query.tokens[length - 1].ttype == sqlparse.tokens.Punctuation:\n+ parsed_query.tokens[length - 1:length - 1] = limit_tokens\n+ else:\n+ parsed_query.tokens += limit_tokens\n+ return str(parsed_query)\ndiff --git a/tests/handlers/test_query_results.py b/tests/handlers/test_query_results.py\nindex 57a9e3dbc7..8e8bd24b76 100644\n--- a/tests/handlers/test_query_results.py\n+++ b/tests/handlers/test_query_results.py\n@@ -1,3 +1,4 @@\n+from redash.query_runner import BaseSQLQueryRunner, BaseQueryRunner\n from tests import BaseTestCase\n \n from redash.models import db\n@@ -39,7 +40,7 @@ def test_supports_unicode(self):\n try:\n rv.headers['Content-Disposition'].encode('ascii')\n except Exception as e:\n- self.fail(repr(e)) \n+ self.fail(repr(e))\n \n \n class TestQueryResultListAPI(BaseTestCase):\n@@ -76,6 +77,47 @@ def test_execute_new_query(self):\n self.assertNotIn(\"query_result\", rv.json)\n self.assertIn(\"job\", rv.json)\n \n+ def test_add_limit_change_query_sql(self):\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"pg\"\n+ )\n+ query = self.factory.create_query(query_text=\"SELECT 2\", data_source=ds)\n+ query_result = self.factory.create_query_result(data_source=ds, query_hash=query.query_hash)\n+\n+ rv = self.make_request(\n+ \"post\",\n+ \"/api/query_results\",\n+ data={\n+ \"data_source_id\": ds.id,\n+ \"query\": query.query_text,\n+ \"apply_auto_limit\": True\n+ },\n+ )\n+\n+ self.assertEqual(rv.status_code, 200)\n+ self.assertNotIn(\"query_result\", rv.json)\n+ self.assertIn(\"job\", rv.json)\n+\n+ def test_add_limit_no_change_for_nonsql(self):\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"prometheus\"\n+ )\n+ query = self.factory.create_query(query_text=\"SELECT 5\", data_source=ds)\n+ query_result = self.factory.create_query_result(data_source=ds, query_hash=query.query_hash)\n+\n+ rv = self.make_request(\n+ \"post\",\n+ \"/api/query_results\",\n+ data={\n+ \"data_source_id\": ds.id,\n+ \"query\": query.query_text,\n+ \"apply_auto_limit\": True\n+ },\n+ )\n+\n+ self.assertEqual(rv.status_code, 200)\n+ self.assertEqual(query_result.id, rv.json[\"query_result\"][\"id\"])\n+\n def test_execute_query_without_access(self):\n group = self.factory.create_group()\n db.session.commit()\ndiff --git a/tests/query_runner/test_basesql_queryrunner.py b/tests/query_runner/test_basesql_queryrunner.py\nnew file mode 100644\nindex 0000000000..1cb1485ae9\n--- /dev/null\n+++ b/tests/query_runner/test_basesql_queryrunner.py\n@@ -0,0 +1,102 @@\n+import unittest\n+\n+from redash.query_runner import BaseSQLQueryRunner, BaseQueryRunner\n+from redash.utils import gen_query_hash\n+\n+\n+class TestBaseSQLQueryRunner(unittest.TestCase):\n+\n+ def setUp(self):\n+ self.query_runner = BaseSQLQueryRunner({})\n+\n+ def test_apply_auto_limit_origin_no_limit_1(self):\n+ origin_query_text = \"SELECT 2\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(\"SELECT 2 LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_origin_have_limit_1(self):\n+ origin_query_text = \"SELECT 2 LIMIT 100\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text, query_text)\n+\n+ def test_apply_auto_limit_origin_have_limit_2(self):\n+ origin_query_text = \"SELECT * FROM fake WHERE id IN (SELECT id FROM fake_2 LIMIT 200) LIMIT 200\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text, query_text)\n+\n+ def test_apply_auto_limit_origin_no_limit_2(self):\n+ origin_query_text = \"SELECT * FROM fake WHERE id IN (SELECT id FROM fake_2 LIMIT 200)\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text + \" LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_non_select_query(self):\n+ origin_query_text = (\"create table execution_times as \"\n+ \"(select id, retrieved_at, data_source_id, query, runtime, query_hash \"\n+ \"from query_results order by 1 desc)\")\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text, query_text)\n+\n+ def test_apply_auto_limit_error_query(self):\n+ origin_query_text = \"dklsk jdhsajhdiwc kkdsakjdwi mdklsjal\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text, query_text)\n+\n+ def test_apply_auto_limit_multi_query_add_limit_1(self):\n+ origin_query_text = (\"insert into execution_times (id, retrieved_at, data_source_id, query, runtime, query_hash) \"\n+ \"select id, retrieved_at, data_source_id, query, runtime, query_hash from query_results \"\n+ \"where id > (select max(id) from execution_times);\\n\"\n+ \"select max(id), 'execution_times' as table_name from execution_times \"\n+ \"union all \"\n+ \"select max(id), 'query_results' as table_name from query_results\")\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text + \" LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_multi_query_add_limit_2(self):\n+ origin_query_text = \"use database demo;\\n\" \\\n+ \"select * from data\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text + \" LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_multi_query_end_with_punc(self):\n+ origin_query_text = (\"select * from table1;\\n\"\n+ \"select * from table2\")\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(\"select * from table1;\\nselect * from table2 LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_multi_query_last_not_select(self):\n+ origin_query_text = (\"select * from table1;\\n\"\n+ \"CREATE TABLE Persons (PersonID int)\")\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(origin_query_text, query_text)\n+\n+ def test_apply_auto_limit_last_command_comment(self):\n+ origin_query_text = \"select * from raw_events; # comment\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(\"select * from raw_events LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_last_command_comment_2(self):\n+ origin_query_text = \"select * from raw_events; -- comment\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(\"select * from raw_events LIMIT 1000\", query_text)\n+\n+ def test_apply_auto_limit_inline_comment(self):\n+ origin_query_text = \"select * from raw_events -- comment\"\n+ query_text = self.query_runner.apply_auto_limit(origin_query_text, True)\n+ self.assertEqual(\"select * from raw_events LIMIT 1000\", query_text)\n+\n+ def test_gen_query_hash_baseSQL(self):\n+ origin_query_text = \"select *\"\n+ expected_query_text = \"select * LIMIT 1000\"\n+ base_runner = BaseQueryRunner({})\n+ self.assertEqual(base_runner.gen_query_hash(expected_query_text),\n+ self.query_runner.gen_query_hash(origin_query_text, True))\n+\n+ def test_gen_query_hash_NoneSQL(self):\n+ origin_query_text = \"select *\"\n+ base_runner = BaseQueryRunner({})\n+ self.assertEqual(gen_query_hash(origin_query_text),\n+ base_runner.gen_query_hash(origin_query_text, True))\n+\n+\n+if __name__ == '__main__':\n+ unittest.main()\ndiff --git a/tests/tasks/test_refresh_queries.py b/tests/tasks/test_refresh_queries.py\nindex 452c1b7702..7285e7048c 100644\n--- a/tests/tasks/test_refresh_queries.py\n+++ b/tests/tasks/test_refresh_queries.py\n@@ -7,14 +7,15 @@\n \n \n class TestRefreshQuery(BaseTestCase):\n- def test_enqueues_outdated_queries(self):\n+ def test_enqueues_outdated_queries_for_sqlquery(self):\n \"\"\"\n refresh_queries() launches an execution task for each query returned\n from Query.outdated_queries().\n \"\"\"\n- query1 = self.factory.create_query()\n+ query1 = self.factory.create_query(options={\"apply_auto_limit\": True})\n query2 = self.factory.create_query(\n- query_text=\"select 42;\", data_source=self.factory.create_data_source()\n+ query_text=\"select 42;\", data_source=self.factory.create_data_source(),\n+ options={\"apply_auto_limit\": True}\n )\n oq = staticmethod(lambda: [query1, query2])\n with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\n@@ -25,12 +26,50 @@ def test_enqueues_outdated_queries(self):\n add_job_mock.assert_has_calls(\n [\n call(\n- query1.query_text,\n+ query1.query_text + \" LIMIT 1000\",\n query1.data_source,\n query1.user_id,\n scheduled_query=query1,\n metadata=ANY,\n ),\n+ call(\n+ \"select 42 LIMIT 1000\",\n+ query2.data_source,\n+ query2.user_id,\n+ scheduled_query=query2,\n+ metadata=ANY,\n+ ),\n+ ],\n+ any_order=True,\n+ )\n+\n+ def test_enqueues_outdated_queries_for_non_sqlquery(self):\n+ \"\"\"\n+ refresh_queries() launches an execution task for each query returned\n+ from Query.outdated_queries().\n+ \"\"\"\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"prometheus\"\n+ )\n+ query1 = self.factory.create_query(data_source=ds, options={\"apply_auto_limit\": True})\n+ query2 = self.factory.create_query(\n+ query_text=\"select 42;\", data_source=ds, options={\"apply_auto_limit\": True}\n+ )\n+ oq = staticmethod(lambda: [query1, query2])\n+ with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\n+ Query, \"outdated_queries\", oq\n+ ):\n+ refresh_queries()\n+ self.assertEqual(add_job_mock.call_count, 2)\n+ add_job_mock.assert_has_calls(\n+ [\n+ call(\n+ query1.query_text,\n+ query1.data_source,\n+ query1.user_id,\n+ scheduled_query=query1,\n+ metadata=ANY,\n+ ),\n call(\n query2.query_text,\n query2.data_source,\n@@ -42,12 +81,12 @@ def test_enqueues_outdated_queries(self):\n any_order=True,\n )\n \n- def test_doesnt_enqueue_outdated_queries_for_paused_data_source(self):\n+ def test_doesnt_enqueue_outdated_queries_for_paused_data_source_for_sqlquery(self):\n \"\"\"\n refresh_queries() does not launch execution tasks for queries whose\n data source is paused.\n \"\"\"\n- query = self.factory.create_query()\n+ query = self.factory.create_query(options={\"apply_auto_limit\": True})\n oq = staticmethod(lambda: [query])\n query.data_source.pause()\n with patch.object(Query, \"outdated_queries\", oq):\n@@ -60,14 +99,42 @@ def test_doesnt_enqueue_outdated_queries_for_paused_data_source(self):\n with patch(ENQUEUE_QUERY) as add_job_mock:\n refresh_queries()\n add_job_mock.assert_called_with(\n- query.query_text,\n+ query.query_text + \" LIMIT 1000\",\n query.data_source,\n query.user_id,\n scheduled_query=query,\n metadata=ANY,\n )\n \n- def test_enqueues_parameterized_queries(self):\n+ def test_doesnt_enqueue_outdated_queries_for_paused_data_source_for_non_sqlquery(self):\n+ \"\"\"\n+ refresh_queries() does not launch execution tasks for queries whose\n+ data source is paused.\n+ \"\"\"\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"prometheus\"\n+ )\n+ query = self.factory.create_query(data_source=ds, options={\"apply_auto_limit\": True})\n+ oq = staticmethod(lambda: [query])\n+ query.data_source.pause()\n+ with patch.object(Query, \"outdated_queries\", oq):\n+ with patch(ENQUEUE_QUERY) as add_job_mock:\n+ refresh_queries()\n+ add_job_mock.assert_not_called()\n+\n+ query.data_source.resume()\n+\n+ with patch(ENQUEUE_QUERY) as add_job_mock:\n+ refresh_queries()\n+ add_job_mock.assert_called_with(\n+ query.query_text,\n+ query.data_source,\n+ query.user_id,\n+ scheduled_query=query,\n+ metadata=ANY,\n+ )\n+\n+ def test_enqueues_parameterized_queries_for_sqlquery(self):\n \"\"\"\n Scheduled queries with parameters use saved values.\n \"\"\"\n@@ -82,10 +149,48 @@ def test_enqueues_parameterized_queries(self):\n \"value\": \"42\",\n \"title\": \"n\",\n }\n- ]\n+ ],\n+ \"apply_auto_limit\": True\n },\n )\n oq = staticmethod(lambda: [query])\n+ with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\n+ Query, \"outdated_queries\", oq\n+ ):\n+ refresh_queries()\n+ add_job_mock.assert_called_with(\n+ \"select 42 LIMIT 1000\",\n+ query.data_source,\n+ query.user_id,\n+ scheduled_query=query,\n+ metadata=ANY,\n+ )\n+\n+ def test_enqueues_parameterized_queries_for_non_sqlquery(self):\n+ \"\"\"\n+ Scheduled queries with parameters use saved values.\n+ \"\"\"\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"prometheus\"\n+ )\n+ query = self.factory.create_query(\n+ query_text=\"select {{n}}\",\n+ options={\n+ \"parameters\": [\n+ {\n+ \"global\": False,\n+ \"type\": \"text\",\n+ \"name\": \"n\",\n+ \"value\": \"42\",\n+ \"title\": \"n\",\n+ }\n+ ],\n+ \"apply_auto_limit\": True\n+\n+ },\n+ data_source=ds,\n+ )\n+ oq = staticmethod(lambda: [query])\n with patch(ENQUEUE_QUERY) as add_job_mock, patch.object(\n Query, \"outdated_queries\", oq\n ):\n@@ -113,7 +218,8 @@ def test_doesnt_enqueue_parameterized_queries_with_invalid_parameters(self):\n \"value\": 42, # <-- should be text!\n \"title\": \"n\",\n }\n- ]\n+ ],\n+ \"apply_auto_limit\": True\n },\n )\n oq = staticmethod(lambda: [query])\n@@ -140,7 +246,8 @@ def test_doesnt_enqueue_parameterized_queries_with_dropdown_queries_that_are_det\n \"queryId\": 100,\n \"title\": \"n\",\n }\n- ]\n+ ],\n+ \"apply_auto_limit\": True\n },\n )\n \ndiff --git a/tests/test_models.py b/tests/test_models.py\nindex 600ff8fef7..20f7365cf4 100644\n--- a/tests/test_models.py\n+++ b/tests/test_models.py\n@@ -4,6 +4,7 @@\n \n import pytz\n from dateutil.parser import parse as date_parse\n+\n from tests import BaseTestCase\n \n from redash import models, redis_connection\n@@ -471,6 +472,37 @@ def test_order_by_relationship(self):\n qs2 = base.order_by(models.User.name.desc())\n self.assertEqual([\"bob\", \"alice\"], [q.user.name for q in qs2])\n \n+ def test_update_query_hash_basesql_with_options(self):\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"pg\"\n+ )\n+ query = self.factory.create_query(query_text=\"SELECT 2\", data_source=ds)\n+ query.options = {\"apply_auto_limit\": True}\n+ origin_hash = query.query_hash\n+ query.update_query_hash()\n+ self.assertNotEqual(origin_hash, query.query_hash)\n+\n+ def test_update_query_hash_basesql_no_options(self):\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"pg\"\n+ )\n+ query = self.factory.create_query(query_text=\"SELECT 2\", data_source=ds)\n+ query.options = {}\n+ origin_hash = query.query_hash\n+ query.update_query_hash()\n+ self.assertEqual(origin_hash, query.query_hash)\n+\n+ def test_update_query_hash_non_basesql(self):\n+ ds = self.factory.create_data_source(\n+ group=self.factory.org.default_group, type=\"prometheus\"\n+ )\n+ query = self.factory.create_query(query_text=\"SELECT 2\", data_source=ds)\n+ query.options = {\"apply_auto_limit\": True}\n+ origin_hash = query.query_hash\n+ query.update_query_hash()\n+ self.assertEqual(origin_hash, query.query_hash)\n+\n+\n \n class TestGroup(BaseTestCase):\n def test_returns_groups_with_specified_names(self):\ndiff --git a/tests/utils/test_query_limit.py b/tests/utils/test_query_limit.py\nnew file mode 100644\nindex 0000000000..089d5592f1\n--- /dev/null\n+++ b/tests/utils/test_query_limit.py\n@@ -0,0 +1,41 @@\n+import unittest\n+\n+from redash.utils import query_is_select_no_limit, add_limit_to_query\n+\n+\n+class TestQueryLimit(unittest.TestCase):\n+ def test_check_query_limit_no_limit(self):\n+ query = \"SELECT *\"\n+ self.assertEqual(True, query_is_select_no_limit(query))\n+\n+ def test_check_query_limit_non_select(self):\n+ query = \"Create Table (PersonID INT)\"\n+ self.assertEqual(False, query_is_select_no_limit(query))\n+\n+ def test_check_query_limit_invalid_1(self):\n+ query = \"OFFSET 5\"\n+ self.assertEqual(False, query_is_select_no_limit(query))\n+\n+ def test_check_query_limit_invalid_2(self):\n+ query = \"TABLE A FROM TABLE B\"\n+ self.assertEqual(False, query_is_select_no_limit(query))\n+\n+ def test_check_query_with_limit(self):\n+ query = \"SELECT * LIMIT 5\"\n+ self.assertEqual(False, query_is_select_no_limit(query))\n+\n+ def test_check_query_with_offset(self):\n+ query = \"SELECT * LIMIT 5 OFFSET 3\"\n+ self.assertEqual(False, query_is_select_no_limit(query))\n+\n+ def test_add_limit_query_no_limit(self):\n+ query = \"SELECT *\"\n+ self.assertEqual(\"SELECT * LIMIT 1000\", add_limit_to_query(query))\n+\n+ def test_add_limit_query_with_punc(self):\n+ query = \"SELECT *;\"\n+ self.assertEqual(\"SELECT * LIMIT 1000;\", add_limit_to_query(query))\n+\n+\n+if __name__ == '__main__':\n+ unittest.main()\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 4,\n \"problem_domain\": \"New Feature Additions\"\n}"}}},{"rowIdx":2395,"cells":{"instance_id":{"kind":"string","value":"getredash__redash-4638@333ee8e"},"repo":{"kind":"string","value":"getredash/redash"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":4638,"string":"4,638"},"title":{"kind":"string","value":"Fix comparison error when scale is None"},"body":{"kind":"string","value":"## What type of PR is this? (check all applicable)\r\n\r\n- [x] Bug Fix\r\n\r\n## Description\r\n\r\nPrevents `'>' not supported between instances of 'NoneType' and 'int'` error when scale is `None`\r\n\r\n## Related Tickets & Documents\r\n\r\nCloses #4786.\r\n"},"created_at":{"kind":"string","value":"2020-02-11T21:51:40Z"},"problem_statement":{"kind":"string","value":"error running query : ** '>' is not supported between instance of NoneType and 'int'\nIssue Summary:\r\nDatabase = Oracle 12c\r\n\r\n`select count(*) from table `\r\n\r\nthrowing the following error\r\n\r\n`error running query : ** '>' is not supported between instance of NoneType and 'int'`\r\n\r\nRedash v9.0.0-alpha(dev)"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"Issue Summary:\r\nDatabase = Oracle 12c\r\n\r\n`select count(*) from table `\r\n\r\nthrowing the following error\r\n\r\n`error running query : ** '>' is not supported between instance of NoneType and 'int'`\r\n\r\nRedash v9.0.0-alpha(dev)\r\n\r\n\r\n","number":4786,"title":"error running query : ** '>' is not supported between instance of NoneType and 'int'"}],"string":"[\n {\n \"body\": \"Issue Summary:\\r\\nDatabase = Oracle 12c\\r\\n\\r\\n`select count(*) from table `\\r\\n\\r\\nthrowing the following error\\r\\n\\r\\n`error running query : ** '>' is not supported between instance of NoneType and 'int'`\\r\\n\\r\\nRedash v9.0.0-alpha(dev)\\r\\n\\r\\n\\r\\n\",\n \"number\": 4786,\n \"title\": \"error running query : ** '>' is not supported between instance of NoneType and 'int'\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"ddb0ef15c1340e7de627e928f80486dfd3d6e1d5"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"333ee8ed2b9d0f4039f7ddfd7e0bac4ad7010b6d\",\n \"head_commit_message\": \"Update oracle.py\",\n \"patch_to_review\": \"diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py\\nindex 4a675836e4..9aaf3d488b 100644\\n--- a/redash/query_runner/oracle.py\\n+++ b/redash/query_runner/oracle.py\\n@@ -35,7 +35,7 @@ class Oracle(BaseSQLQueryRunner):\\n @classmethod\\n def get_col_type(cls, col_type, scale):\\n if col_type == cx_Oracle.NUMBER:\\n- return TYPE_FLOAT if scale > 0 else TYPE_INTEGER\\n+ return TYPE_INTEGER if scale is False else TYPE_FLOAT\\n else:\\n return TYPES_MAP.get(col_type, None)\\n \\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -35,7 +35,7 @@ class Oracle(BaseSQLQueryRunner):\n @classmethod\n def get_col_type(cls, col_type, scale):\n if col_type == cx_Oracle.NUMBER:\n- return TYPE_FLOAT if scale > 0 else TYPE_INTEGER\n+ return TYPE_INTEGER if scale is False else TYPE_FLOAT","line":null,"original_line":38,"original_start_line":null,"path":"redash/query_runner/oracle.py","start_line":null,"text":"@user1:\nIf `scale` can be `None`, then in such cases it will be classified as a float. Is this correct? If not, you might want to change the if statement.\n\n@author:\nMy understanding is that if scale is *not* `None` or is `> 0` (so basically it is a truthy value) it should be classified as a Float, otherwise Integer.\r\n\r\nHowever, here is the [definition ](https://cx-oracle.readthedocs.io/en/latest/user_guide/sql_execution.html#id10) from `cx_Oracle` for `NUMBER`:\r\n\r\n> If the column is unconstrained (no precision and scale specified), the value will be returned as a float or an int depending on whether the value itself is an integer. In all other cases the value is returned as a float.\r\n\r\n\r\nSeems like `None` does not always mean `Integer`. Maybe we should look at the value itself whether it is an int or float to decide at this point?\n\n@user1:\n> Maybe we should look at the value itself whether it is an int or float to decide at this point?\r\n\r\nSounds like the safest option, no?"}],"string":"[\n {\n \"diff_hunk\": \"@@ -35,7 +35,7 @@ class Oracle(BaseSQLQueryRunner):\\n @classmethod\\n def get_col_type(cls, col_type, scale):\\n if col_type == cx_Oracle.NUMBER:\\n- return TYPE_FLOAT if scale > 0 else TYPE_INTEGER\\n+ return TYPE_INTEGER if scale is False else TYPE_FLOAT\",\n \"line\": null,\n \"original_line\": 38,\n \"original_start_line\": null,\n \"path\": \"redash/query_runner/oracle.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nIf `scale` can be `None`, then in such cases it will be classified as a float. Is this correct? If not, you might want to change the if statement.\\n\\n@author:\\nMy understanding is that if scale is *not* `None` or is `> 0` (so basically it is a truthy value) it should be classified as a Float, otherwise Integer.\\r\\n\\r\\nHowever, here is the [definition ](https://cx-oracle.readthedocs.io/en/latest/user_guide/sql_execution.html#id10) from `cx_Oracle` for `NUMBER`:\\r\\n\\r\\n> If the column is unconstrained (no precision and scale specified), the value will be returned as a float or an int depending on whether the value itself is an integer. In all other cases the value is returned as a float.\\r\\n\\r\\n\\r\\nSeems like `None` does not always mean `Integer`. Maybe we should look at the value itself whether it is an int or float to decide at this point?\\n\\n@user1:\\n> Maybe we should look at the value itself whether it is an int or float to decide at this point?\\r\\n\\r\\nSounds like the safest option, no?\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"e6550c236ca85ad004e1860766223ce9a9c6cf6f"},"merged_patch":{"kind":"string","value":"diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py\nindex 4a675836e4..e079c297a7 100644\n--- a/redash/query_runner/oracle.py\n+++ b/redash/query_runner/oracle.py\n@@ -35,7 +35,11 @@ class Oracle(BaseSQLQueryRunner):\n @classmethod\n def get_col_type(cls, col_type, scale):\n if col_type == cx_Oracle.NUMBER:\n- return TYPE_FLOAT if scale > 0 else TYPE_INTEGER\n+ if scale is None:\n+ return TYPE_INTEGER\n+ if scale > 0:\n+ return TYPE_FLOAT\n+ return TYPE_INTEGER\n else:\n return TYPES_MAP.get(col_type, None)\n \n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"low\",\n \"estimated_review_effort\": 2,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2396,"cells":{"instance_id":{"kind":"string","value":"getredash__redash-4186@ac02337"},"repo":{"kind":"string","value":"getredash/redash"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":4186,"string":"4,186"},"title":{"kind":"string","value":"Fix query based dropdown not adding quote marks correctly"},"body":{"kind":"string","value":"## What type of PR is this? (check all applicable)\r\n<!-- Please leave only what's applicable -->\r\n\r\n- [x] Bug Fix\r\n\r\n## Description\r\nThis is not perfect yet, I still wanna explore a few more options without having the Dropdown Options in the Parameter structure context (that's the only difference from the regular Dropdown code - what handles if the value is valid is the Input).\r\n\r\n## Related Tickets & Documents\r\nFixes #4184\r\n\r\n## Mobile & Desktop Screenshots/Recordings (if there are UI changes)\r\n--"},"created_at":{"kind":"string","value":"2019-09-25T23:06:40Z"},"problem_statement":{"kind":"string","value":"Query with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly\n### Issue Summary\r\n\r\nQuery with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly.\r\n\r\n### Steps to Reproduce\r\n\r\n1. Create a query with a parameter with query based dropdown list.\r\n2. Select allow multiple values, double quotation mark.\r\n3. Execute query, when the parameter select only 1 choice and the parameter is text, it didn't add double quotation mark and the query returns an error.\r\n\r\n### Technical details:\r\n\r\n* Redash Version: 8.0 Beta 2\r\n* Browser/OS: CentOS 7\r\n* How did you install Redash: Docker"},"hints_text":{"kind":"string","value":"@gabrieldutra is this expected or a bug?\n@ranbena it should have the quote mark in any case when you set them.\r\n\r\n@myonlylonely I tried it in our [netlify preview](https://redash-preview.netlify.com/queries/123/source?p_test=%5B%22MrCirca%22%5D#219) and it seems to be adding the quotes as expected:\r\n\r\n<img src=\"https://user-images.githubusercontent.com/3356951/65598030-e7374100-df70-11e9-8c64-1da35be2b5c5.png\" width=\"50%\" />\r\n\r\nBut I did notice a different issue that may be what's going on here: what happens if you remove the value the querie has, run the query, add it back and run the query again?\nI created a new query \"Search Album New Sample\" on netlify preview.\r\n\r\n\r\nBut when I choose 2 items in the dropdown list, It returns the results.\r\n\r\n\r\nWhen I delete 2 items to 1 item, It returns the results correctly.\r\n\r\n\r\nFor the first time I created a new query with a drop down list based on query (Allow multiple values with quotation mark), it always not adding the quotation mark, and it returns an error.\nThanks @myonlylonely, that's exactly what I was thinking before :+1:.\r\n\r\nIt seems it's having trouble to handle empty values (for Multiple values it should allow you to leave it empty). I'll take a deeper look into it today and submit a fix PR, but a workaround for you to have this working is to save the query right after you have it working as it should."},"resolved_issues":{"kind":"list like","value":[{"body":"### Issue Summary\r\n\r\nQuery with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly.\r\n\r\n### Steps to Reproduce\r\n\r\n1. Create a query with a parameter with query based dropdown list.\r\n2. Select allow multiple values, double quotation mark.\r\n3. Execute query, when the parameter select only 1 choice and the parameter is text, it didn't add double quotation mark and the query returns an error.\r\n\r\n### Technical details:\r\n\r\n* Redash Version: 8.0 Beta 2\r\n* Browser/OS: CentOS 7\r\n* How did you install Redash: Docker\r\n","number":4184,"title":"Query with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly"}],"string":"[\n {\n \"body\": \"### Issue Summary\\r\\n\\r\\nQuery with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly.\\r\\n\\r\\n### Steps to Reproduce\\r\\n\\r\\n1. Create a query with a parameter with query based dropdown list.\\r\\n2. Select allow multiple values, double quotation mark.\\r\\n3. Execute query, when the parameter select only 1 choice and the parameter is text, it didn't add double quotation mark and the query returns an error.\\r\\n\\r\\n### Technical details:\\r\\n\\r\\n* Redash Version: 8.0 Beta 2\\r\\n* Browser/OS: CentOS 7\\r\\n* How did you install Redash: Docker\\r\\n\",\n \"number\": 4184,\n \"title\": \"Query with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"cb144598816e40ddb133e046772da01ce53a41e8"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"ac023371080942cd27d800842463f0e31b68f9f2\",\n \"head_commit_message\": \"Normalize array in parameter structure\",\n \"patch_to_review\": \"diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx\\nindex d55f5aa2b6..6b69559c31 100644\\n--- a/client/app/components/QueryBasedParameterInput.jsx\\n+++ b/client/app/components/QueryBasedParameterInput.jsx\\n@@ -1,4 +1,4 @@\\n-import { find, isFunction, isArray, isEqual, toString, map, intersection } from 'lodash';\\n+import { find, isArray, map, intersection, isEqual } from 'lodash';\\n import React from 'react';\\n import PropTypes from 'prop-types';\\n import { react2angular } from 'react2angular';\\n@@ -29,6 +29,7 @@ export class QueryBasedParameterInput extends React.Component {\\n super(props);\\n this.state = {\\n options: [],\\n+ value: null,\\n loading: false,\\n };\\n }\\n@@ -41,6 +42,24 @@ export class QueryBasedParameterInput extends React.Component {\\n if (this.props.queryId !== prevProps.queryId) {\\n this._loadOptions(this.props.queryId);\\n }\\n+ if (this.props.value !== prevProps.value) {\\n+ this.setValue(this.props.value);\\n+ }\\n+ }\\n+\\n+ setValue(value) {\\n+ const { options } = this.state;\\n+ if (this.props.mode === 'multiple') {\\n+ value = isArray(value) ? value : [value];\\n+ const optionValues = map(options, option => option.value);\\n+ const validValues = intersection(value, optionValues);\\n+ this.setState({ value: validValues });\\n+ return validValues;\\n+ }\\n+ const found = find(options, option => option.value === this.props.value) !== undefined;\\n+ value = found ? value : options[0].value;\\n+ this.setState({ value });\\n+ return value;\\n }\\n \\n async _loadOptions(queryId) {\\n@@ -50,20 +69,12 @@ export class QueryBasedParameterInput extends React.Component {\\n \\n // stale queryId check\\n if (this.props.queryId === queryId) {\\n- this.setState({ options, loading: false });\\n-\\n- if (this.props.mode === 'multiple' && isArray(this.props.value)) {\\n- const optionValues = map(options, option => option.value);\\n- const validValues = intersection(this.props.value, optionValues);\\n- if (!isEqual(this.props.value, validValues)) {\\n- this.props.onSelect(validValues);\\n- }\\n- } else {\\n- const found = find(options, option => option.value === this.props.value) !== undefined;\\n- if (!found && isFunction(this.props.onSelect)) {\\n- this.props.onSelect(options[0].value);\\n+ this.setState({ options, loading: false }, () => {\\n+ const updatedValue = this.setValue(this.props.value);\\n+ if (!isEqual(updatedValue, this.props.value)) {\\n+ this.props.onSelect(updatedValue);\\n }\\n- }\\n+ });\\n }\\n }\\n }\\n@@ -78,7 +89,7 @@ export class QueryBasedParameterInput extends React.Component {\\n disabled={loading || (options.length === 0)}\\n loading={loading}\\n mode={mode}\\n- value={isArray(value) ? value : toString(value)}\\n+ value={this.state.value}\\n onChange={onSelect}\\n dropdownMatchSelectWidth={false}\\n optionFilterProp=\\\"children\\\"\\ndiff --git a/client/app/services/query.js b/client/app/services/query.js\\nindex 9b14581f6f..f6ca0c34f5 100644\\n--- a/client/app/services/query.js\\n+++ b/client/app/services/query.js\\n@@ -253,6 +253,12 @@ export class Parameter {\\n }\\n }\\n \\n+ if (this.type === 'query' && !isEmptyValue(value)) {\\n+ if (this.multiValuesOptions && !isArray(value) && value !== null) {\\n+ value = [value];\\n+ }\\n+ }\\n+\\n if (isDateRangeParameter(this.type)) {\\n this.value = null;\\n this.$$value = null;\\n@@ -387,7 +393,8 @@ export class Parameter {\\n if (has(query, key)) {\\n if (this.multiValuesOptions) {\\n try {\\n- this.setValue(JSON.parse(query[key]));\\n+ const valueFromJson = JSON.parse(query[key]);\\n+ this.setValue(isArray(valueFromJson) ? valueFromJson : query[key]);\\n } catch (e) {\\n this.setValue(query[key]);\\n }\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -253,6 +253,12 @@ export class Parameter {\n }\n }\n \n+ if (this.type === 'query' && !isEmptyValue(value)) {\n+ if (this.multiValuesOptions && !isArray(value) && value !== null) {","line":null,"original_line":257,"original_start_line":null,"path":"client/app/services/query.js","start_line":null,"text":"@user1:\nDon't think you need to check `value !== null` cause it's checked the line before.\n\n@author:\nYeah, I was a bit paranoid on this one :sweat_smile:"}],"string":"[\n {\n \"diff_hunk\": \"@@ -253,6 +253,12 @@ export class Parameter {\\n }\\n }\\n \\n+ if (this.type === 'query' && !isEmptyValue(value)) {\\n+ if (this.multiValuesOptions && !isArray(value) && value !== null) {\",\n \"line\": null,\n \"original_line\": 257,\n \"original_start_line\": null,\n \"path\": \"client/app/services/query.js\",\n \"start_line\": null,\n \"text\": \"@user1:\\nDon't think you need to check `value !== null` cause it's checked the line before.\\n\\n@author:\\nYeah, I was a bit paranoid on this one :sweat_smile:\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"18e2ed87557b5453b743be06541426e3ef9a107a"},"merged_patch":{"kind":"string","value":"diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx\nindex d55f5aa2b6..6b69559c31 100644\n--- a/client/app/components/QueryBasedParameterInput.jsx\n+++ b/client/app/components/QueryBasedParameterInput.jsx\n@@ -1,4 +1,4 @@\n-import { find, isFunction, isArray, isEqual, toString, map, intersection } from 'lodash';\n+import { find, isArray, map, intersection, isEqual } from 'lodash';\n import React from 'react';\n import PropTypes from 'prop-types';\n import { react2angular } from 'react2angular';\n@@ -29,6 +29,7 @@ export class QueryBasedParameterInput extends React.Component {\n super(props);\n this.state = {\n options: [],\n+ value: null,\n loading: false,\n };\n }\n@@ -41,6 +42,24 @@ export class QueryBasedParameterInput extends React.Component {\n if (this.props.queryId !== prevProps.queryId) {\n this._loadOptions(this.props.queryId);\n }\n+ if (this.props.value !== prevProps.value) {\n+ this.setValue(this.props.value);\n+ }\n+ }\n+\n+ setValue(value) {\n+ const { options } = this.state;\n+ if (this.props.mode === 'multiple') {\n+ value = isArray(value) ? value : [value];\n+ const optionValues = map(options, option => option.value);\n+ const validValues = intersection(value, optionValues);\n+ this.setState({ value: validValues });\n+ return validValues;\n+ }\n+ const found = find(options, option => option.value === this.props.value) !== undefined;\n+ value = found ? value : options[0].value;\n+ this.setState({ value });\n+ return value;\n }\n \n async _loadOptions(queryId) {\n@@ -50,20 +69,12 @@ export class QueryBasedParameterInput extends React.Component {\n \n // stale queryId check\n if (this.props.queryId === queryId) {\n- this.setState({ options, loading: false });\n-\n- if (this.props.mode === 'multiple' && isArray(this.props.value)) {\n- const optionValues = map(options, option => option.value);\n- const validValues = intersection(this.props.value, optionValues);\n- if (!isEqual(this.props.value, validValues)) {\n- this.props.onSelect(validValues);\n- }\n- } else {\n- const found = find(options, option => option.value === this.props.value) !== undefined;\n- if (!found && isFunction(this.props.onSelect)) {\n- this.props.onSelect(options[0].value);\n+ this.setState({ options, loading: false }, () => {\n+ const updatedValue = this.setValue(this.props.value);\n+ if (!isEqual(updatedValue, this.props.value)) {\n+ this.props.onSelect(updatedValue);\n }\n- }\n+ });\n }\n }\n }\n@@ -78,7 +89,7 @@ export class QueryBasedParameterInput extends React.Component {\n disabled={loading || (options.length === 0)}\n loading={loading}\n mode={mode}\n- value={isArray(value) ? value : toString(value)}\n+ value={this.state.value}\n onChange={onSelect}\n dropdownMatchSelectWidth={false}\n optionFilterProp=\"children\"\ndiff --git a/client/app/services/query.js b/client/app/services/query.js\nindex 9b14581f6f..1af3f25268 100644\n--- a/client/app/services/query.js\n+++ b/client/app/services/query.js\n@@ -253,6 +253,12 @@ export class Parameter {\n }\n }\n \n+ if (this.type === 'query' && !isEmptyValue(value)) {\n+ if (this.multiValuesOptions && !isArray(value)) {\n+ value = [value];\n+ }\n+ }\n+\n if (isDateRangeParameter(this.type)) {\n this.value = null;\n this.$$value = null;\n@@ -387,7 +393,8 @@ export class Parameter {\n if (has(query, key)) {\n if (this.multiValuesOptions) {\n try {\n- this.setValue(JSON.parse(query[key]));\n+ const valueFromJson = JSON.parse(query[key]);\n+ this.setValue(isArray(valueFromJson) ? valueFromJson : query[key]);\n } catch (e) {\n this.setValue(query[key]);\n }\ndiff --git a/client/cypress/integration/query/parameter_spec.js b/client/cypress/integration/query/parameter_spec.js\nindex e6824f9a11..35fb9afd7c 100644\n--- a/client/cypress/integration/query/parameter_spec.js\n+++ b/client/cypress/integration/query/parameter_spec.js\n@@ -108,7 +108,7 @@ describe('Parameter', () => {\n describe('Dropdown Parameter', () => {\n beforeEach(() => {\n const queryData = {\n- name: 'Number Parameter',\n+ name: 'Dropdown Parameter',\n query: \"SELECT '{{test-parameter}}' AS parameter\",\n options: {\n parameters: [\n@@ -180,6 +180,69 @@ describe('Parameter', () => {\n });\n });\n \n+ describe('Query Based Dropdown Parameter', () => {\n+ beforeEach(() => {\n+ const dropdownQueryData = {\n+ name: 'Dropdown Query',\n+ query: `SELECT 'value1' AS name, 1 AS value UNION ALL\n+ SELECT 'value2' AS name, 2 AS value UNION ALL\n+ SELECT 'value3' AS name, 3 AS value`,\n+ };\n+ createQuery(dropdownQueryData, true).then((dropdownQuery) => {\n+ const queryData = {\n+ name: 'Query Based Dropdown Parameter',\n+ query: \"SELECT '{{test-parameter}}' AS parameter\",\n+ options: {\n+ parameters: [\n+ { name: 'test-parameter',\n+ title: 'Test Parameter',\n+ type: 'query',\n+ queryId: dropdownQuery.id },\n+ ],\n+ },\n+ };\n+\n+ cy.visit(`/queries/${dropdownQuery.id}`);\n+ cy.getByTestId('ExecuteButton').click();\n+ cy.getByTestId('TableVisualization')\n+ .should('contain', 'value1')\n+ .and('contain', 'value2')\n+ .and('contain', 'value3');\n+\n+ createQuery(queryData, false)\n+ .then(({ id }) => cy.visit(`/queries/${id}/source`));\n+ });\n+ });\n+\n+ it('supports multi-selection', () => {\n+ cy.clickThrough(`\n+ ParameterSettings-test-parameter\n+ AllowMultipleValuesCheckbox\n+ QuotationSelect\n+ DoubleQuotationMarkOption\n+ SaveParameterSettings\n+ `);\n+\n+ cy.getByTestId('ParameterName-test-parameter')\n+ .find('.ant-select')\n+ .click();\n+\n+ // make sure all options are unselected and select all\n+ cy.get('li.ant-select-dropdown-menu-item').each(($option) => {\n+ expect($option).not.to.have.class('ant-select-dropdown-menu-item-selected');\n+ cy.wrap($option).click();\n+ });\n+\n+ cy.getByTestId('QueryEditor').click(); // just to close the select menu\n+\n+ cy.getByTestId('ParameterApplyButton')\n+ .click();\n+\n+ cy.getByTestId('TableVisualization')\n+ .should('contain', '\"1\",\"2\",\"3\"');\n+ });\n+ });\n+\n describe('Date Parameter', () => {\n const selectCalendarDate = (date) => {\n cy.getByTestId('ParameterName-test-parameter')\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2397,"cells":{"instance_id":{"kind":"string","value":"home-assistant__core-147576@37735ee"},"repo":{"kind":"string","value":"home-assistant/core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":147576,"string":"147,576"},"title":{"kind":"string","value":"Do not factory reset old Z-Wave controller during migration"},"body":{"kind":"string","value":"## Proposed change\r\n<!--\r\n Describe the big picture of your changes here to communicate to the\r\n maintainers why we should accept this pull request. If it fixes a bug\r\n or resolves a feature request, be sure to link to that issue in the\r\n additional information section.\r\n-->\r\nAlso removed the confirmation before that since the we are just creating a backup now and this is not destructive.\r\n@MartinHjelmare am I correct that all of this home_id code can be removed when we don't reset anymore?\r\n\r\n## Type of change\r\n<!--\r\n What type of change does your PR introduce to Home Assistant?\r\n NOTE: Please, check only 1! box!\r\n If your PR requires multiple boxes to be checked, you'll most likely need to\r\n split it into multiple PRs. This makes things easier and faster to code review.\r\n-->\r\n\r\n- [ ] Dependency upgrade\r\n- [x] Bugfix (non-breaking change which fixes an issue)\r\n- [ ] New integration (thank you!)\r\n- [ ] New feature (which adds functionality to an existing integration)\r\n- [ ] Deprecation (breaking change to happen in the future)\r\n- [ ] Breaking change (fix/feature causing existing functionality to break)\r\n- [ ] Code quality improvements to existing code or addition of tests\r\n\r\n## Additional information\r\n<!--\r\n Details are important, and help maintainers processing your PR.\r\n Please be sure to fill out additional details, if applicable.\r\n-->\r\n\r\n- This PR fixes or closes issue: fixes https://github.com/zwave-js/backlog/issues/102\r\n- This PR is related to issue: \r\n- Link to documentation pull request: \r\n- Link to developer documentation pull request: \r\n- Link to frontend pull request: \r\n\r\n## Checklist\r\n<!--\r\n Put an `x` in the boxes that apply. You can also fill these out after\r\n creating the PR. If you're unsure about any of them, don't hesitate to ask.\r\n We're here to help! This is simply a reminder of what we are going to look\r\n for before merging your code.\r\n-->\r\n\r\n- [ ] The code change is tested and works locally.\r\n- [x] Local tests pass. **Your PR cannot be merged unless tests pass**\r\n- [x] There is no commented out code in this PR.\r\n- [x] I have followed the [development checklist][dev-checklist]\r\n- [x] I have followed the [perfect PR recommendations][perfect-pr]\r\n- [x] The code has been formatted using Ruff (`ruff format homeassistant tests`)\r\n- [x] Tests have been added to verify that the new code works.\r\n\r\nIf user exposed functionality or configuration variables are added/changed:\r\n\r\n- [ ] Documentation added/updated for [www.home-assistant.io][docs-repository]\r\n\r\nIf the code communicates with devices, web services, or third-party tools:\r\n\r\n- [ ] The [manifest file][manifest-docs] has all fields filled out correctly. \r\n Updated and included derived files by running: `python3 -m script.hassfest`.\r\n- [ ] New or updated dependencies have been added to `requirements_all.txt`. \r\n Updated by running `python3 -m script.gen_requirements_all`.\r\n- [ ] For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.\r\n\r\n<!--\r\n This project is very active and we have a high turnover of pull requests.\r\n\r\n Unfortunately, the number of incoming pull requests is higher than what our\r\n reviewers can review and merge so there is a long backlog of pull requests\r\n waiting for review. You can help here!\r\n \r\n By reviewing another pull request, you will help raise the code quality of\r\n that pull request and the final review will be faster. This way the general\r\n pace of pull request reviews will go up and your wait time will go down.\r\n \r\n When picking a pull request to review, try to choose one that hasn't yet\r\n been reviewed.\r\n\r\n Thanks for helping out!\r\n-->\r\n\r\nTo help with the load of incoming pull requests:\r\n\r\n- [x] I have reviewed two other [open pull requests][prs] in this repository.\r\n\r\n[prs]: https://github.com/home-assistant/core/pulls?q=is%3Aopen+is%3Apr+-author%3A%40me+-draft%3Atrue+-label%3Awaiting-for-upstream+sort%3Acreated-desc+review%3Anone+-status%3Afailure\r\n\r\n<!--\r\n Thank you for contributing <3\r\n\r\n Below, some useful links you could explore:\r\n-->\r\n[dev-checklist]: https://developers.home-assistant.io/docs/development_checklist/\r\n[manifest-docs]: https://developers.home-assistant.io/docs/creating_integration_manifest/\r\n[quality-scale]: https://developers.home-assistant.io/docs/integration_quality_scale_index/\r\n[docs-repository]: https://github.com/home-assistant/home-assistant.io\r\n[perfect-pr]: https://developers.home-assistant.io/docs/review-process/#creating-the-perfect-pr\r\n"},"created_at":{"kind":"string","value":"2025-06-26T09:04:36Z"},"problem_statement":{"kind":"string","value":"Do not factory reset old controller during NVM migration\nWe decided that the risk of resetting a working controller before the replacement is up and running is more relevant than the potential issue of a user leaving the old controller plugged in and messing with communication."},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"We decided that the risk of resetting a working controller before the replacement is up and running is more relevant than the potential issue of a user leaving the old controller plugged in and messing with communication.","number":102,"title":"Do not factory reset old controller during NVM migration"}],"string":"[\n {\n \"body\": \"We decided that the risk of resetting a working controller before the replacement is up and running is more relevant than the potential issue of a user leaving the old controller plugged in and messing with communication.\",\n \"number\": 102,\n \"title\": \"Do not factory reset old controller during NVM migration\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"6f4615f012c3339542a9cc1e4dc24b4a0a99a744"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"37735eefed03971f1713bf4276388ddbb437e0de\",\n \"head_commit_message\": \"Do not factory reset old Z-Wave controller during migration\",\n \"patch_to_review\": \"diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py\\nindex 5e8e702283976f..8fe05f91f01a03 100644\\n--- a/homeassistant/components/zwave_js/config_flow.py\\n+++ b/homeassistant/components/zwave_js/config_flow.py\\n@@ -843,11 +843,8 @@ async def async_step_intent_migrate(\\n },\\n )\\n \\n- if user_input is not None:\\n- self._migrating = True\\n- return await self.async_step_backup_nvm()\\n-\\n- return self.async_show_form(step_id=\\\"intent_migrate\\\")\\n+ self._migrating = True\\n+ return await self.async_step_backup_nvm()\\n \\n async def async_step_backup_nvm(\\n self, user_input: dict[str, Any] | None = None\\n@@ -902,7 +899,7 @@ async def async_step_restore_nvm(\\n async def async_step_instruct_unplug(\\n self, user_input: dict[str, Any] | None = None\\n ) -> ConfigFlowResult:\\n- \\\"\\\"\\\"Reset the current controller, and instruct the user to unplug it.\\\"\\\"\\\"\\n+ \\\"\\\"\\\"Instruct the user to unplug the old controller.\\\"\\\"\\\"\\n \\n if user_input is not None:\\n if self.usb_path:\\n@@ -912,63 +909,9 @@ async def async_step_instruct_unplug(\\n # Now that the old controller is gone, we can scan for serial ports again\\n return await self.async_step_choose_serial_port()\\n \\n- try:\\n- driver = self._get_driver()\\n- except AbortFlow:\\n- return self.async_abort(reason=\\\"config_entry_not_loaded\\\")\\n-\\n- @callback\\n- def set_driver_ready(event: dict) -> None:\\n- \\\"Set the driver ready event.\\\"\\n- wait_driver_ready.set()\\n-\\n- wait_driver_ready = asyncio.Event()\\n-\\n- unsubscribe = driver.once(\\\"driver ready\\\", set_driver_ready)\\n-\\n- # reset the old controller\\n- try:\\n- await driver.async_hard_reset()\\n- except FailedCommand as err:\\n- unsubscribe()\\n- _LOGGER.error(\\\"Failed to reset controller: %s\\\", err)\\n- return self.async_abort(reason=\\\"reset_failed\\\")\\n-\\n- # Update the unique id of the config entry\\n- # to the new home id, which requires waiting for the driver\\n- # to be ready before getting the new home id.\\n- # If the backup restore, done later in the flow, fails,\\n- # the config entry unique id should be the new home id\\n- # after the controller reset.\\n- try:\\n- async with asyncio.timeout(DRIVER_READY_TIMEOUT):\\n- await wait_driver_ready.wait()\\n- except TimeoutError:\\n- pass\\n- finally:\\n- unsubscribe()\\n-\\n config_entry = self._reconfigure_config_entry\\n assert config_entry is not None\\n \\n- try:\\n- version_info = await async_get_version_info(\\n- self.hass, config_entry.data[CONF_URL]\\n- )\\n- except CannotConnect:\\n- # Just log this error, as there's nothing to do about it here.\\n- # The stale unique id needs to be handled by a repair flow,\\n- # after the config entry has been reloaded, if the backup restore\\n- # also fails.\\n- _LOGGER.debug(\\n- \\\"Failed to get server version, cannot update config entry \\\"\\n- \\\"unique id with new home id, after controller reset\\\"\\n- )\\n- else:\\n- self.hass.config_entries.async_update_entry(\\n- config_entry, unique_id=str(version_info.home_id)\\n- )\\n-\\n # Unload the config entry before asking the user to unplug the controller.\\n await self.hass.config_entries.async_unload(config_entry.entry_id)\\n \\ndiff --git a/homeassistant/components/zwave_js/strings.json b/homeassistant/components/zwave_js/strings.json\\nindex d9a3b82a47ca62..04bef3f8d25e4d 100644\\n--- a/homeassistant/components/zwave_js/strings.json\\n+++ b/homeassistant/components/zwave_js/strings.json\\n@@ -109,12 +109,11 @@\\n }\\n },\\n \\\"intent_migrate\\\": {\\n- \\\"title\\\": \\\"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\\\",\\n- \\\"description\\\": \\\"Before setting up your new controller, your old controller needs to be reset. A backup will be performed first.\\\\n\\\\nDo you wish to continue?\\\"\\n+ \\\"title\\\": \\\"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\\\"\\n },\\n \\\"instruct_unplug\\\": {\\n \\\"title\\\": \\\"Unplug your old controller\\\",\\n- \\\"description\\\": \\\"Backup saved to \\\\\\\"{file_path}\\\\\\\"\\\\n\\\\nYour old controller has been reset. If the hardware is no longer needed, you can now unplug it.\\\\n\\\\nPlease make sure your new controller is plugged in before continuing.\\\"\\n+ \\\"description\\\": \\\"Backup saved to \\\\\\\"{file_path}\\\\\\\"\\\\n\\\\nYour old controller has not been reset. You should now unplug it to prevent it from interfering with the new controller.\\\\n\\\\nPlease make sure your new controller is plugged in before continuing.\\\"\\n },\\n \\\"restore_failed\\\": {\\n \\\"title\\\": \\\"Restoring unsuccessful\\\",\\ndiff --git a/tests/components/zwave_js/test_config_flow.py b/tests/components/zwave_js/test_config_flow.py\\nindex dd8838e0775d09..3c5f9a2c8b8bbd 100644\\n--- a/tests/components/zwave_js/test_config_flow.py\\n+++ b/tests/components/zwave_js/test_config_flow.py\\n@@ -864,11 +864,8 @@ async def test_usb_discovery_migration(\\n restart_addon: AsyncMock,\\n client: MagicMock,\\n integration: MockConfigEntry,\\n- get_server_version: AsyncMock,\\n ) -> None:\\n \\\"\\\"\\\"Test usb discovery migration.\\\"\\\"\\\"\\n- version_info = get_server_version.return_value\\n- version_info.home_id = 4321\\n addon_options[\\\"device\\\"] = \\\"/dev/ttyUSB0\\\"\\n entry = integration\\n assert client.connect.call_count == 1\\n@@ -893,13 +890,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n async def mock_restore_nvm(data: bytes):\\n client.driver.controller.emit(\\n \\\"nvm convert progress\\\",\\n@@ -927,10 +917,6 @@ async def mock_restore_nvm(data: bytes):\\n )\\n \\n assert mock_usb_serial_by_id.call_count == 2\\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n \\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n@@ -947,7 +933,6 @@ async def mock_restore_nvm(data: bytes):\\n \\n assert result[\\\"type\\\"] is FlowResultType.FORM\\n assert result[\\\"step_id\\\"] == \\\"instruct_unplug\\\"\\n- assert entry.unique_id == \\\"4321\\\"\\n \\n result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n \\n@@ -962,8 +947,6 @@ async def mock_restore_nvm(data: bytes):\\n \\n assert restart_addon.call_args == call(\\\"core_zwave_js\\\")\\n \\n- version_info.home_id = 5678\\n-\\n result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"])\\n \\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n@@ -986,7 +969,6 @@ async def mock_restore_nvm(data: bytes):\\n assert entry.data[\\\"usb_path\\\"] == USB_DISCOVERY_INFO.device\\n assert entry.data[\\\"use_addon\\\"] is True\\n assert \\\"keep_old_devices\\\" not in entry.data\\n- assert entry.unique_id == \\\"5678\\\"\\n \\n \\n @pytest.mark.usefixtures(\\\"supervisor\\\", \\\"addon_running\\\")\\n@@ -1024,13 +1006,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n async def mock_restore_nvm(data: bytes):\\n client.driver.controller.emit(\\n \\\"nvm convert progress\\\",\\n@@ -1055,10 +1030,6 @@ async def mock_restore_nvm(data: bytes):\\n )\\n \\n assert mock_usb_serial_by_id.call_count == 2\\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n \\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n@@ -3399,25 +3370,6 @@ async def test_reconfigure_migrate_low_sdk_version(\\n \\n \\n @pytest.mark.usefixtures(\\\"supervisor\\\", \\\"addon_running\\\")\\n-@pytest.mark.parametrize(\\n- (\\n- \\\"reset_server_version_side_effect\\\",\\n- \\\"reset_unique_id\\\",\\n- \\\"restore_server_version_side_effect\\\",\\n- \\\"final_unique_id\\\",\\n- ),\\n- [\\n- (None, \\\"4321\\\", None, \\\"3245146787\\\"),\\n- (aiohttp.ClientError(\\\"Boom\\\"), \\\"3245146787\\\", None, \\\"3245146787\\\"),\\n- (None, \\\"4321\\\", aiohttp.ClientError(\\\"Boom\\\"), \\\"5678\\\"),\\n- (\\n- aiohttp.ClientError(\\\"Boom\\\"),\\n- \\\"3245146787\\\",\\n- aiohttp.ClientError(\\\"Boom\\\"),\\n- \\\"5678\\\",\\n- ),\\n- ],\\n-)\\n async def test_reconfigure_migrate_with_addon(\\n hass: HomeAssistant,\\n client: MagicMock,\\n@@ -3427,16 +3379,8 @@ async def test_reconfigure_migrate_with_addon(\\n restart_addon: AsyncMock,\\n addon_options: dict[str, Any],\\n set_addon_options: AsyncMock,\\n- get_server_version: AsyncMock,\\n- reset_server_version_side_effect: Exception | None,\\n- reset_unique_id: str,\\n- restore_server_version_side_effect: Exception | None,\\n- final_unique_id: str,\\n ) -> None:\\n \\\"\\\"\\\"Test migration flow with add-on.\\\"\\\"\\\"\\n- get_server_version.side_effect = reset_server_version_side_effect\\n- version_info = get_server_version.return_value\\n- version_info.home_id = 4321\\n entry = integration\\n assert client.connect.call_count == 1\\n assert client.driver.controller.home_id == 3245146787\\n@@ -3494,13 +3438,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n async def mock_restore_nvm(data: bytes):\\n client.driver.controller.emit(\\n \\\"nvm convert progress\\\",\\n@@ -3531,11 +3468,6 @@ async def mock_restore_nvm(data: bytes):\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n \\n@@ -3552,7 +3484,6 @@ async def mock_restore_nvm(data: bytes):\\n assert result[\\\"type\\\"] is FlowResultType.FORM\\n assert result[\\\"step_id\\\"] == \\\"instruct_unplug\\\"\\n assert entry.state is config_entries.ConfigEntryState.NOT_LOADED\\n- assert entry.unique_id == reset_unique_id\\n \\n result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n \\n@@ -3565,10 +3496,6 @@ async def mock_restore_nvm(data: bytes):\\n with pytest.raises(InInvalid):\\n data_schema.schema[CONF_USB_PATH](addon_options[\\\"device\\\"])\\n \\n- # Reset side effect before starting the add-on.\\n- get_server_version.side_effect = None\\n- version_info.home_id = 5678\\n-\\n result = await hass.config_entries.flow.async_configure(\\n result[\\\"flow_id\\\"],\\n user_input={\\n@@ -3599,10 +3526,6 @@ async def mock_restore_nvm(data: bytes):\\n \\n result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"])\\n \\n- assert entry.unique_id == \\\"5678\\\"\\n- get_server_version.side_effect = restore_server_version_side_effect\\n- version_info.home_id = 3245146787\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"restore_nvm\\\"\\n assert client.connect.call_count == 2\\n@@ -3623,7 +3546,6 @@ async def mock_restore_nvm(data: bytes):\\n assert entry.data[\\\"usb_path\\\"] == \\\"/test\\\"\\n assert entry.data[\\\"use_addon\\\"] is True\\n assert \\\"keep_old_devices\\\" not in entry.data\\n- assert entry.unique_id == final_unique_id\\n \\n assert len(device_registry.devices) == 2\\n controller_device_id_ext = (\\n@@ -3653,11 +3575,8 @@ async def test_reconfigure_migrate_reset_driver_ready_timeout(\\n integration: MockConfigEntry,\\n restart_addon: AsyncMock,\\n set_addon_options: AsyncMock,\\n- get_server_version: AsyncMock,\\n ) -> None:\\n \\\"\\\"\\\"Test migration flow with driver ready timeout after controller reset.\\\"\\\"\\\"\\n- version_info = get_server_version.return_value\\n- version_info.home_id = 4321\\n entry = integration\\n assert client.connect.call_count == 1\\n hass.config_entries.async_update_entry(\\n@@ -3681,11 +3600,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- await asyncio.sleep(0)\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n async def mock_restore_nvm(data: bytes):\\n client.driver.controller.emit(\\n \\\"nvm convert progress\\\",\\n@@ -3715,9 +3629,6 @@ async def mock_restore_nvm(data: bytes):\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n with (\\n patch(\\n (\\\"homeassistant.components.zwave_js.config_flow.DRIVER_READY_TIMEOUT\\\"),\\n@@ -3742,7 +3653,6 @@ async def mock_restore_nvm(data: bytes):\\n assert result[\\\"type\\\"] is FlowResultType.FORM\\n assert result[\\\"step_id\\\"] == \\\"instruct_unplug\\\"\\n assert entry.state is config_entries.ConfigEntryState.NOT_LOADED\\n- assert entry.unique_id == \\\"4321\\\"\\n \\n result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n \\n@@ -3769,8 +3679,6 @@ async def mock_restore_nvm(data: bytes):\\n \\n assert restart_addon.call_args == call(\\\"core_zwave_js\\\")\\n \\n- version_info.home_id = 5678\\n-\\n result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"])\\n \\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n@@ -3792,7 +3700,6 @@ async def mock_restore_nvm(data: bytes):\\n assert entry.data[\\\"url\\\"] == \\\"ws://host1:3001\\\"\\n assert entry.data[\\\"usb_path\\\"] == \\\"/test\\\"\\n assert entry.data[\\\"use_addon\\\"] is True\\n- assert entry.unique_id == \\\"5678\\\"\\n assert \\\"keep_old_devices\\\" not in entry.data\\n \\n \\n@@ -3828,13 +3735,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n async def mock_restore_nvm(data: bytes):\\n client.driver.controller.emit(\\n \\\"nvm convert progress\\\",\\n@@ -3861,11 +3761,6 @@ async def mock_restore_nvm(data: bytes):\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n \\n@@ -3960,11 +3855,6 @@ async def test_reconfigure_migrate_backup_failure(\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.ABORT\\n assert result[\\\"reason\\\"] == \\\"backup_failed\\\"\\n assert \\\"keep_old_devices\\\" not in entry.data\\n@@ -3998,11 +3888,6 @@ async def mock_backup_nvm_raw():\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n \\n@@ -4040,13 +3925,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n result = await entry.start_reconfigure_flow(hass)\\n \\n assert result[\\\"type\\\"] is FlowResultType.MENU\\n@@ -4056,11 +3934,6 @@ async def mock_reset_controller():\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n \\n@@ -4124,12 +3997,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n client.driver.controller.async_restore_nvm = AsyncMock(\\n side_effect=FailedCommand(\\\"test_error\\\", \\\"unknown_error\\\")\\n )\\n@@ -4143,11 +4010,6 @@ async def mock_reset_controller():\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n \\n@@ -4242,106 +4104,6 @@ async def test_get_driver_failure_intent_migrate(\\n assert \\\"keep_old_devices\\\" not in entry.data\\n \\n \\n-async def test_get_driver_failure_instruct_unplug(\\n- hass: HomeAssistant,\\n- client: MagicMock,\\n- integration: MockConfigEntry,\\n-) -> None:\\n- \\\"\\\"\\\"Test get driver failure in instruct unplug step.\\\"\\\"\\\"\\n-\\n- async def mock_backup_nvm_raw():\\n- await asyncio.sleep(0)\\n- client.driver.controller.emit(\\n- \\\"nvm backup progress\\\", {\\\"bytesRead\\\": 100, \\\"total\\\": 200}\\n- )\\n- return b\\\"test_nvm_data\\\"\\n-\\n- client.driver.controller.async_backup_nvm_raw = AsyncMock(\\n- side_effect=mock_backup_nvm_raw\\n- )\\n- entry = integration\\n- hass.config_entries.async_update_entry(\\n- entry, unique_id=\\\"1234\\\", data={**entry.data, \\\"use_addon\\\": True}\\n- )\\n- result = await entry.start_reconfigure_flow(hass)\\n- assert result[\\\"type\\\"] is FlowResultType.MENU\\n- assert result[\\\"step_id\\\"] == \\\"reconfigure\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(\\n- result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n- )\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n- assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n-\\n- with patch(\\\"pathlib.Path.write_bytes\\\") as mock_file:\\n- await hass.async_block_till_done()\\n- assert client.driver.controller.async_backup_nvm_raw.call_count == 1\\n- assert mock_file.call_count == 1\\n-\\n- await hass.config_entries.async_unload(entry.entry_id)\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"])\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.ABORT\\n- assert result[\\\"reason\\\"] == \\\"config_entry_not_loaded\\\"\\n-\\n-\\n-async def test_hard_reset_failure(\\n- hass: HomeAssistant,\\n- integration: MockConfigEntry,\\n- client: MagicMock,\\n-) -> None:\\n- \\\"\\\"\\\"Test hard reset failure.\\\"\\\"\\\"\\n- entry = integration\\n- hass.config_entries.async_update_entry(\\n- entry, unique_id=\\\"1234\\\", data={**entry.data, \\\"use_addon\\\": True}\\n- )\\n-\\n- async def mock_backup_nvm_raw():\\n- await asyncio.sleep(0)\\n- return b\\\"test_nvm_data\\\"\\n-\\n- client.driver.controller.async_backup_nvm_raw = AsyncMock(\\n- side_effect=mock_backup_nvm_raw\\n- )\\n- client.driver.async_hard_reset = AsyncMock(\\n- side_effect=FailedCommand(\\\"test_error\\\", \\\"unknown_error\\\")\\n- )\\n-\\n- result = await entry.start_reconfigure_flow(hass)\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.MENU\\n- assert result[\\\"step_id\\\"] == \\\"reconfigure\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(\\n- result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n- )\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n- assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n-\\n- with patch(\\\"pathlib.Path.write_bytes\\\") as mock_file:\\n- await hass.async_block_till_done()\\n- assert client.driver.controller.async_backup_nvm_raw.call_count == 1\\n- assert mock_file.call_count == 1\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"])\\n-\\n- assert result[\\\"type\\\"] is FlowResultType.ABORT\\n- assert result[\\\"reason\\\"] == \\\"reset_failed\\\"\\n-\\n-\\n async def test_choose_serial_port_usb_ports_failure(\\n hass: HomeAssistant,\\n integration: MockConfigEntry,\\n@@ -4361,13 +4123,6 @@ async def mock_backup_nvm_raw():\\n side_effect=mock_backup_nvm_raw\\n )\\n \\n- async def mock_reset_controller():\\n- client.driver.emit(\\n- \\\"driver ready\\\", {\\\"event\\\": \\\"driver ready\\\", \\\"source\\\": \\\"driver\\\"}\\n- )\\n-\\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\\n-\\n result = await entry.start_reconfigure_flow(hass)\\n \\n assert result[\\\"type\\\"] is FlowResultType.MENU\\n@@ -4377,11 +4132,6 @@ async def mock_reset_controller():\\n result[\\\"flow_id\\\"], {\\\"next_step_id\\\": \\\"intent_migrate\\\"}\\n )\\n \\n- assert result[\\\"type\\\"] is FlowResultType.FORM\\n- assert result[\\\"step_id\\\"] == \\\"intent_migrate\\\"\\n-\\n- result = await hass.config_entries.flow.async_configure(result[\\\"flow_id\\\"], {})\\n-\\n assert result[\\\"type\\\"] is FlowResultType.SHOW_PROGRESS\\n assert result[\\\"step_id\\\"] == \\\"backup_nvm\\\"\\n \\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -3399,25 +3370,6 @@ async def test_reconfigure_migrate_low_sdk_version(\n \n \n @pytest.mark.usefixtures(\"supervisor\", \"addon_running\")\n-@pytest.mark.parametrize(","line":3402,"original_line":3402,"original_start_line":null,"path":"tests/components/zwave_js/test_config_flow.py","start_line":null,"text":"@user1:\nDon't remove all of this. Just remove the reset side effects and corresponding unique id."},{"diff_hunk":"@@ -109,12 +109,11 @@\n }\n },\n \"intent_migrate\": {\n- \"title\": \"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\",\n- \"description\": \"Before setting up your new controller, your old controller needs to be reset. A backup will be performed first.\\n\\nDo you wish to continue?\"\n+ \"title\": \"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\"","line":null,"original_line":112,"original_start_line":null,"path":"homeassistant/components/zwave_js/strings.json","start_line":null,"text":"@user1:\nThere's no form at all in the intent_migrate step now, right? Then we can remove the strings for that step."}],"string":"[\n {\n \"diff_hunk\": \"@@ -3399,25 +3370,6 @@ async def test_reconfigure_migrate_low_sdk_version(\\n \\n \\n @pytest.mark.usefixtures(\\\"supervisor\\\", \\\"addon_running\\\")\\n-@pytest.mark.parametrize(\",\n \"line\": 3402,\n \"original_line\": 3402,\n \"original_start_line\": null,\n \"path\": \"tests/components/zwave_js/test_config_flow.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nDon't remove all of this. Just remove the reset side effects and corresponding unique id.\"\n },\n {\n \"diff_hunk\": \"@@ -109,12 +109,11 @@\\n }\\n },\\n \\\"intent_migrate\\\": {\\n- \\\"title\\\": \\\"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\\\",\\n- \\\"description\\\": \\\"Before setting up your new controller, your old controller needs to be reset. A backup will be performed first.\\\\n\\\\nDo you wish to continue?\\\"\\n+ \\\"title\\\": \\\"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\\\"\",\n \"line\": null,\n \"original_line\": 112,\n \"original_start_line\": null,\n \"path\": \"homeassistant/components/zwave_js/strings.json\",\n \"start_line\": null,\n \"text\": \"@user1:\\nThere's no form at all in the intent_migrate step now, right? Then we can remove the strings for that step.\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"ec4cc9885faba1d972aadb6947a7a7baaaab554c"},"merged_patch":{"kind":"string","value":"diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py\nindex 2c37ee4b554301..a109719965cbf1 100644\n--- a/homeassistant/components/zwave_js/config_flow.py\n+++ b/homeassistant/components/zwave_js/config_flow.py\n@@ -845,11 +845,8 @@ async def async_step_intent_migrate(\n },\n )\n \n- if user_input is not None:\n- self._migrating = True\n- return await self.async_step_backup_nvm()\n-\n- return self.async_show_form(step_id=\"intent_migrate\")\n+ self._migrating = True\n+ return await self.async_step_backup_nvm()\n \n async def async_step_backup_nvm(\n self, user_input: dict[str, Any] | None = None\n@@ -904,7 +901,7 @@ async def async_step_restore_nvm(\n async def async_step_instruct_unplug(\n self, user_input: dict[str, Any] | None = None\n ) -> ConfigFlowResult:\n- \"\"\"Reset the current controller, and instruct the user to unplug it.\"\"\"\n+ \"\"\"Instruct the user to unplug the old controller.\"\"\"\n \n if user_input is not None:\n if self.usb_path:\n@@ -914,63 +911,9 @@ async def async_step_instruct_unplug(\n # Now that the old controller is gone, we can scan for serial ports again\n return await self.async_step_choose_serial_port()\n \n- try:\n- driver = self._get_driver()\n- except AbortFlow:\n- return self.async_abort(reason=\"config_entry_not_loaded\")\n-\n- @callback\n- def set_driver_ready(event: dict) -> None:\n- \"Set the driver ready event.\"\n- wait_driver_ready.set()\n-\n- wait_driver_ready = asyncio.Event()\n-\n- unsubscribe = driver.once(\"driver ready\", set_driver_ready)\n-\n- # reset the old controller\n- try:\n- await driver.async_hard_reset()\n- except FailedCommand as err:\n- unsubscribe()\n- _LOGGER.error(\"Failed to reset controller: %s\", err)\n- return self.async_abort(reason=\"reset_failed\")\n-\n- # Update the unique id of the config entry\n- # to the new home id, which requires waiting for the driver\n- # to be ready before getting the new home id.\n- # If the backup restore, done later in the flow, fails,\n- # the config entry unique id should be the new home id\n- # after the controller reset.\n- try:\n- async with asyncio.timeout(DRIVER_READY_TIMEOUT):\n- await wait_driver_ready.wait()\n- except TimeoutError:\n- pass\n- finally:\n- unsubscribe()\n-\n config_entry = self._reconfigure_config_entry\n assert config_entry is not None\n \n- try:\n- version_info = await async_get_version_info(\n- self.hass, config_entry.data[CONF_URL]\n- )\n- except CannotConnect:\n- # Just log this error, as there's nothing to do about it here.\n- # The stale unique id needs to be handled by a repair flow,\n- # after the config entry has been reloaded, if the backup restore\n- # also fails.\n- _LOGGER.debug(\n- \"Failed to get server version, cannot update config entry \"\n- \"unique id with new home id, after controller reset\"\n- )\n- else:\n- self.hass.config_entries.async_update_entry(\n- config_entry, unique_id=str(version_info.home_id)\n- )\n-\n # Unload the config entry before asking the user to unplug the controller.\n await self.hass.config_entries.async_unload(config_entry.entry_id)\n \ndiff --git a/homeassistant/components/zwave_js/strings.json b/homeassistant/components/zwave_js/strings.json\nindex d9a3b82a47ca62..f61d871cfb90b5 100644\n--- a/homeassistant/components/zwave_js/strings.json\n+++ b/homeassistant/components/zwave_js/strings.json\n@@ -108,13 +108,9 @@\n \"intent_reconfigure\": \"Re-configure the current controller\"\n }\n },\n- \"intent_migrate\": {\n- \"title\": \"[%key:component::zwave_js::config::step::reconfigure::menu_options::intent_migrate%]\",\n- \"description\": \"Before setting up your new controller, your old controller needs to be reset. A backup will be performed first.\\n\\nDo you wish to continue?\"\n- },\n \"instruct_unplug\": {\n \"title\": \"Unplug your old controller\",\n- \"description\": \"Backup saved to \\\"{file_path}\\\"\\n\\nYour old controller has been reset. If the hardware is no longer needed, you can now unplug it.\\n\\nPlease make sure your new controller is plugged in before continuing.\"\n+ \"description\": \"Backup saved to \\\"{file_path}\\\"\\n\\nYour old controller has not been reset. You should now unplug it to prevent it from interfering with the new controller.\\n\\nPlease make sure your new controller is plugged in before continuing.\"\n },\n \"restore_failed\": {\n \"title\": \"Restoring unsuccessful\",\ndiff --git a/tests/components/zwave_js/test_config_flow.py b/tests/components/zwave_js/test_config_flow.py\nindex 2e41a176a9c229..e99cedbdcbae86 100644\n--- a/tests/components/zwave_js/test_config_flow.py\n+++ b/tests/components/zwave_js/test_config_flow.py\n@@ -867,8 +867,6 @@ async def test_usb_discovery_migration(\n get_server_version: AsyncMock,\n ) -> None:\n \"\"\"Test usb discovery migration.\"\"\"\n- version_info = get_server_version.return_value\n- version_info.home_id = 4321\n addon_options[\"device\"] = \"/dev/ttyUSB0\"\n entry = integration\n assert client.connect.call_count == 1\n@@ -893,13 +891,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n client.driver.controller.emit(\n \"nvm convert progress\",\n@@ -927,10 +918,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n )\n \n assert mock_usb_serial_by_id.call_count == 2\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n \n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n@@ -947,7 +934,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n \n assert result[\"type\"] is FlowResultType.FORM\n assert result[\"step_id\"] == \"instruct_unplug\"\n- assert entry.unique_id == \"4321\"\n \n result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n \n@@ -962,6 +948,7 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n \n assert restart_addon.call_args == call(\"core_zwave_js\")\n \n+ version_info = get_server_version.return_value\n version_info.home_id = 5678\n \n result = await hass.config_entries.flow.async_configure(result[\"flow_id\"])\n@@ -1024,13 +1011,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n client.driver.controller.emit(\n \"nvm convert progress\",\n@@ -1055,10 +1035,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n )\n \n assert mock_usb_serial_by_id.call_count == 2\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n \n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n@@ -3401,21 +3377,12 @@ async def test_reconfigure_migrate_low_sdk_version(\n @pytest.mark.usefixtures(\"supervisor\", \"addon_running\")\n @pytest.mark.parametrize(\n (\n- \"reset_server_version_side_effect\",\n- \"reset_unique_id\",\n \"restore_server_version_side_effect\",\n \"final_unique_id\",\n ),\n [\n- (None, \"4321\", None, \"3245146787\"),\n- (aiohttp.ClientError(\"Boom\"), \"3245146787\", None, \"3245146787\"),\n- (None, \"4321\", aiohttp.ClientError(\"Boom\"), \"5678\"),\n- (\n- aiohttp.ClientError(\"Boom\"),\n- \"3245146787\",\n- aiohttp.ClientError(\"Boom\"),\n- \"5678\",\n- ),\n+ (None, \"3245146787\"),\n+ (aiohttp.ClientError(\"Boom\"), \"5678\"),\n ],\n )\n async def test_reconfigure_migrate_with_addon(\n@@ -3428,15 +3395,11 @@ async def test_reconfigure_migrate_with_addon(\n addon_options: dict[str, Any],\n set_addon_options: AsyncMock,\n get_server_version: AsyncMock,\n- reset_server_version_side_effect: Exception | None,\n- reset_unique_id: str,\n restore_server_version_side_effect: Exception | None,\n final_unique_id: str,\n ) -> None:\n \"\"\"Test migration flow with add-on.\"\"\"\n- get_server_version.side_effect = reset_server_version_side_effect\n version_info = get_server_version.return_value\n- version_info.home_id = 4321\n entry = integration\n assert client.connect.call_count == 1\n assert client.driver.controller.home_id == 3245146787\n@@ -3494,13 +3457,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n client.driver.controller.emit(\n \"nvm convert progress\",\n@@ -3531,11 +3487,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n \n@@ -3552,7 +3503,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n assert result[\"type\"] is FlowResultType.FORM\n assert result[\"step_id\"] == \"instruct_unplug\"\n assert entry.state is config_entries.ConfigEntryState.NOT_LOADED\n- assert entry.unique_id == reset_unique_id\n \n result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n \n@@ -3565,8 +3515,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n with pytest.raises(InInvalid):\n data_schema.schema[CONF_USB_PATH](addon_options[\"device\"])\n \n- # Reset side effect before starting the add-on.\n- get_server_version.side_effect = None\n version_info.home_id = 5678\n \n result = await hass.config_entries.flow.async_configure(\n@@ -3646,156 +3594,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n assert client.driver.controller.home_id == 3245146787\n \n \n-@pytest.mark.usefixtures(\"supervisor\", \"addon_running\")\n-async def test_reconfigure_migrate_reset_driver_ready_timeout(\n- hass: HomeAssistant,\n- client: MagicMock,\n- integration: MockConfigEntry,\n- restart_addon: AsyncMock,\n- set_addon_options: AsyncMock,\n- get_server_version: AsyncMock,\n-) -> None:\n- \"\"\"Test migration flow with driver ready timeout after controller reset.\"\"\"\n- version_info = get_server_version.return_value\n- version_info.home_id = 4321\n- entry = integration\n- assert client.connect.call_count == 1\n- hass.config_entries.async_update_entry(\n- entry,\n- unique_id=\"1234\",\n- data={\n- \"url\": \"ws://localhost:3000\",\n- \"use_addon\": True,\n- \"usb_path\": \"/dev/ttyUSB0\",\n- },\n- )\n-\n- async def mock_backup_nvm_raw():\n- await asyncio.sleep(0)\n- client.driver.controller.emit(\n- \"nvm backup progress\", {\"bytesRead\": 100, \"total\": 200}\n- )\n- return b\"test_nvm_data\"\n-\n- client.driver.controller.async_backup_nvm_raw = AsyncMock(\n- side_effect=mock_backup_nvm_raw\n- )\n-\n- async def mock_reset_controller():\n- await asyncio.sleep(0)\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n- async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n- client.driver.controller.emit(\n- \"nvm convert progress\",\n- {\"event\": \"nvm convert progress\", \"bytesRead\": 100, \"total\": 200},\n- )\n- await asyncio.sleep(0)\n- client.driver.controller.emit(\n- \"nvm restore progress\",\n- {\"event\": \"nvm restore progress\", \"bytesWritten\": 100, \"total\": 200},\n- )\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.controller.async_restore_nvm = AsyncMock(side_effect=mock_restore_nvm)\n-\n- events = async_capture_events(\n- hass, data_entry_flow.EVENT_DATA_ENTRY_FLOW_PROGRESS_UPDATE\n- )\n-\n- result = await entry.start_reconfigure_flow(hass)\n-\n- assert result[\"type\"] is FlowResultType.MENU\n- assert result[\"step_id\"] == \"reconfigure\"\n-\n- result = await hass.config_entries.flow.async_configure(\n- result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n- )\n-\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- with (\n- patch(\n- (\"homeassistant.components.zwave_js.config_flow.DRIVER_READY_TIMEOUT\"),\n- new=0,\n- ),\n- patch(\"pathlib.Path.write_bytes\") as mock_file,\n- ):\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n- assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n- assert result[\"step_id\"] == \"backup_nvm\"\n-\n- await hass.async_block_till_done()\n- assert client.driver.controller.async_backup_nvm_raw.call_count == 1\n- assert mock_file.call_count == 1\n- assert len(events) == 1\n- assert events[0].data[\"progress\"] == 0.5\n- events.clear()\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"])\n-\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"instruct_unplug\"\n- assert entry.state is config_entries.ConfigEntryState.NOT_LOADED\n- assert entry.unique_id == \"4321\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"choose_serial_port\"\n- data_schema = result[\"data_schema\"]\n- assert data_schema is not None\n- assert data_schema.schema[CONF_USB_PATH]\n-\n- result = await hass.config_entries.flow.async_configure(\n- result[\"flow_id\"],\n- user_input={\n- CONF_USB_PATH: \"/test\",\n- },\n- )\n-\n- assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n- assert result[\"step_id\"] == \"start_addon\"\n- assert set_addon_options.call_args == call(\n- \"core_zwave_js\", AddonsOptions(config={\"device\": \"/test\"})\n- )\n-\n- await hass.async_block_till_done()\n-\n- assert restart_addon.call_args == call(\"core_zwave_js\")\n-\n- version_info.home_id = 5678\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"])\n-\n- assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n- assert result[\"step_id\"] == \"restore_nvm\"\n- assert client.connect.call_count == 2\n-\n- await hass.async_block_till_done()\n- assert client.connect.call_count == 4\n- assert entry.state is config_entries.ConfigEntryState.LOADED\n- assert client.driver.controller.async_restore_nvm.call_count == 1\n- assert len(events) == 2\n- assert events[0].data[\"progress\"] == 0.25\n- assert events[1].data[\"progress\"] == 0.75\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"])\n-\n- assert result[\"type\"] is FlowResultType.ABORT\n- assert result[\"reason\"] == \"migration_successful\"\n- assert entry.data[\"url\"] == \"ws://host1:3001\"\n- assert entry.data[\"usb_path\"] == \"/test\"\n- assert entry.data[\"use_addon\"] is True\n- assert entry.unique_id == \"5678\"\n- assert \"keep_old_devices\" not in entry.data\n-\n-\n @pytest.mark.usefixtures(\"supervisor\", \"addon_running\")\n async def test_reconfigure_migrate_restore_driver_ready_timeout(\n hass: HomeAssistant,\n@@ -3828,13 +3626,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n client.driver.controller.emit(\n \"nvm convert progress\",\n@@ -3861,11 +3652,6 @@ async def mock_restore_nvm(data: bytes, options: dict[str, bool] | None = None):\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n \n@@ -3960,11 +3746,6 @@ async def test_reconfigure_migrate_backup_failure(\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.ABORT\n assert result[\"reason\"] == \"backup_failed\"\n assert \"keep_old_devices\" not in entry.data\n@@ -3998,11 +3779,6 @@ async def mock_backup_nvm_raw():\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n \n@@ -4040,13 +3816,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n result = await entry.start_reconfigure_flow(hass)\n \n assert result[\"type\"] is FlowResultType.MENU\n@@ -4056,11 +3825,6 @@ async def mock_reset_controller():\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n \n@@ -4124,12 +3888,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n client.driver.controller.async_restore_nvm = AsyncMock(\n side_effect=FailedCommand(\"test_error\", \"unknown_error\")\n )\n@@ -4143,11 +3901,6 @@ async def mock_reset_controller():\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n \n@@ -4242,106 +3995,6 @@ async def test_get_driver_failure_intent_migrate(\n assert \"keep_old_devices\" not in entry.data\n \n \n-async def test_get_driver_failure_instruct_unplug(\n- hass: HomeAssistant,\n- client: MagicMock,\n- integration: MockConfigEntry,\n-) -> None:\n- \"\"\"Test get driver failure in instruct unplug step.\"\"\"\n-\n- async def mock_backup_nvm_raw():\n- await asyncio.sleep(0)\n- client.driver.controller.emit(\n- \"nvm backup progress\", {\"bytesRead\": 100, \"total\": 200}\n- )\n- return b\"test_nvm_data\"\n-\n- client.driver.controller.async_backup_nvm_raw = AsyncMock(\n- side_effect=mock_backup_nvm_raw\n- )\n- entry = integration\n- hass.config_entries.async_update_entry(\n- entry, unique_id=\"1234\", data={**entry.data, \"use_addon\": True}\n- )\n- result = await entry.start_reconfigure_flow(hass)\n- assert result[\"type\"] is FlowResultType.MENU\n- assert result[\"step_id\"] == \"reconfigure\"\n-\n- result = await hass.config_entries.flow.async_configure(\n- result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n- )\n-\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n- assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n- assert result[\"step_id\"] == \"backup_nvm\"\n-\n- with patch(\"pathlib.Path.write_bytes\") as mock_file:\n- await hass.async_block_till_done()\n- assert client.driver.controller.async_backup_nvm_raw.call_count == 1\n- assert mock_file.call_count == 1\n-\n- await hass.config_entries.async_unload(entry.entry_id)\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"])\n-\n- assert result[\"type\"] is FlowResultType.ABORT\n- assert result[\"reason\"] == \"config_entry_not_loaded\"\n-\n-\n-async def test_hard_reset_failure(\n- hass: HomeAssistant,\n- integration: MockConfigEntry,\n- client: MagicMock,\n-) -> None:\n- \"\"\"Test hard reset failure.\"\"\"\n- entry = integration\n- hass.config_entries.async_update_entry(\n- entry, unique_id=\"1234\", data={**entry.data, \"use_addon\": True}\n- )\n-\n- async def mock_backup_nvm_raw():\n- await asyncio.sleep(0)\n- return b\"test_nvm_data\"\n-\n- client.driver.controller.async_backup_nvm_raw = AsyncMock(\n- side_effect=mock_backup_nvm_raw\n- )\n- client.driver.async_hard_reset = AsyncMock(\n- side_effect=FailedCommand(\"test_error\", \"unknown_error\")\n- )\n-\n- result = await entry.start_reconfigure_flow(hass)\n-\n- assert result[\"type\"] is FlowResultType.MENU\n- assert result[\"step_id\"] == \"reconfigure\"\n-\n- result = await hass.config_entries.flow.async_configure(\n- result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n- )\n-\n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n- assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n- assert result[\"step_id\"] == \"backup_nvm\"\n-\n- with patch(\"pathlib.Path.write_bytes\") as mock_file:\n- await hass.async_block_till_done()\n- assert client.driver.controller.async_backup_nvm_raw.call_count == 1\n- assert mock_file.call_count == 1\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"])\n-\n- assert result[\"type\"] is FlowResultType.ABORT\n- assert result[\"reason\"] == \"reset_failed\"\n-\n-\n async def test_choose_serial_port_usb_ports_failure(\n hass: HomeAssistant,\n integration: MockConfigEntry,\n@@ -4361,13 +4014,6 @@ async def mock_backup_nvm_raw():\n side_effect=mock_backup_nvm_raw\n )\n \n- async def mock_reset_controller():\n- client.driver.emit(\n- \"driver ready\", {\"event\": \"driver ready\", \"source\": \"driver\"}\n- )\n-\n- client.driver.async_hard_reset = AsyncMock(side_effect=mock_reset_controller)\n-\n result = await entry.start_reconfigure_flow(hass)\n \n assert result[\"type\"] is FlowResultType.MENU\n@@ -4377,11 +4023,6 @@ async def mock_reset_controller():\n result[\"flow_id\"], {\"next_step_id\": \"intent_migrate\"}\n )\n \n- assert result[\"type\"] is FlowResultType.FORM\n- assert result[\"step_id\"] == \"intent_migrate\"\n-\n- result = await hass.config_entries.flow.async_configure(result[\"flow_id\"], {})\n-\n assert result[\"type\"] is FlowResultType.SHOW_PROGRESS\n assert result[\"step_id\"] == \"backup_nvm\"\n \n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2398,"cells":{"instance_id":{"kind":"string","value":"home-assistant__core-146453@71eab0c"},"repo":{"kind":"string","value":"home-assistant/core"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":146453,"string":"146,453"},"title":{"kind":"string","value":"Split deprecated system issue in 2 places"},"body":{"kind":"string","value":"<!--\r\n You are amazing! Thanks for contributing to our project!\r\n Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).\r\n-->\r\n## Proposed change\r\n<!--\r\n Describe the big picture of your changes here to communicate to the\r\n maintainers why we should accept this pull request. If it fixes a bug\r\n or resolves a feature request, be sure to link to that issue in the\r\n additional information section.\r\n-->\r\nSo apparently `hassio` only fetches data some time later after HA started. Thus we can't determine in the `homeassistant` component if users are running a supported system. So instead, we split the issue creation to `homeassistant` where we create issues for Container and core running on 32-bit architectures and create an issue for core being deprecated, and `hassio` where we create the issues for OS and Supervised running on 32-bit architectures and create an issue for Supervised being deprecated. Additionally, if we can find out that the user is running a 32-bit OS on 64-bit hardware, we let them know they can fix their issue.\r\n\r\n## Type of change\r\n<!--\r\n What type of change does your PR introduce to Home Assistant?\r\n NOTE: Please, check only 1! box!\r\n If your PR requires multiple boxes to be checked, you'll most likely need to\r\n split it into multiple PRs. This makes things easier and faster to code review.\r\n-->\r\n\r\n- [ ] Dependency upgrade\r\n- [x] Bugfix (non-breaking change which fixes an issue)\r\n- [ ] New integration (thank you!)\r\n- [ ] New feature (which adds functionality to an existing integration)\r\n- [ ] Deprecation (breaking change to happen in the future)\r\n- [ ] Breaking change (fix/feature causing existing functionality to break)\r\n- [ ] Code quality improvements to existing code or addition of tests\r\n\r\n## Additional information\r\n<!--\r\n Details are important, and help maintainers processing your PR.\r\n Please be sure to fill out additional details, if applicable.\r\n-->\r\n\r\n- This PR fixes or closes issue: fixes #145730\r\n- This PR is related to issue: \r\n- Link to documentation pull request: \r\n- Link to developer documentation pull request: \r\n- Link to frontend pull request: \r\n\r\n## Checklist\r\n<!--\r\n Put an `x` in the boxes that apply. You can also fill these out after\r\n creating the PR. If you're unsure about any of them, don't hesitate to ask.\r\n We're here to help! This is simply a reminder of what we are going to look\r\n for before merging your code.\r\n-->\r\n\r\n- [ ] The code change is tested and works locally.\r\n- [ ] Local tests pass. **Your PR cannot be merged unless tests pass**\r\n- [ ] There is no commented out code in this PR.\r\n- [ ] I have followed the [development checklist][dev-checklist]\r\n- [ ] I have followed the [perfect PR recommendations][perfect-pr]\r\n- [ ] The code has been formatted using Ruff (`ruff format homeassistant tests`)\r\n- [ ] Tests have been added to verify that the new code works.\r\n\r\nIf user exposed functionality or configuration variables are added/changed:\r\n\r\n- [ ] Documentation added/updated for [www.home-assistant.io][docs-repository]\r\n\r\nIf the code communicates with devices, web services, or third-party tools:\r\n\r\n- [ ] The [manifest file][manifest-docs] has all fields filled out correctly. \r\n Updated and included derived files by running: `python3 -m script.hassfest`.\r\n- [ ] New or updated dependencies have been added to `requirements_all.txt`. \r\n Updated by running `python3 -m script.gen_requirements_all`.\r\n- [ ] For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.\r\n\r\n<!--\r\n This project is very active and we have a high turnover of pull requests.\r\n\r\n Unfortunately, the number of incoming pull requests is higher than what our\r\n reviewers can review and merge so there is a long backlog of pull requests\r\n waiting for review. You can help here!\r\n \r\n By reviewing another pull request, you will help raise the code quality of\r\n that pull request and the final review will be faster. This way the general\r\n pace of pull request reviews will go up and your wait time will go down.\r\n \r\n When picking a pull request to review, try to choose one that hasn't yet\r\n been reviewed.\r\n\r\n Thanks for helping out!\r\n-->\r\n\r\nTo help with the load of incoming pull requests:\r\n\r\n- [ ] I have reviewed two other [open pull requests][prs] in this repository.\r\n\r\n[prs]: https://github.com/home-assistant/core/pulls?q=is%3Aopen+is%3Apr+-author%3A%40me+-draft%3Atrue+-label%3Awaiting-for-upstream+sort%3Acreated-desc+review%3Anone+-status%3Afailure\r\n\r\n<!--\r\n Thank you for contributing <3\r\n\r\n Below, some useful links you could explore:\r\n-->\r\n[dev-checklist]: https://developers.home-assistant.io/docs/development_checklist/\r\n[manifest-docs]: https://developers.home-assistant.io/docs/creating_integration_manifest/\r\n[quality-scale]: https://developers.home-assistant.io/docs/integration_quality_scale_index/\r\n[docs-repository]: https://github.com/home-assistant/home-assistant.io\r\n[perfect-pr]: https://developers.home-assistant.io/docs/review-process/#creating-the-perfect-pr\r\n"},"created_at":{"kind":"string","value":"2025-06-10T13:01:25Z"},"problem_statement":{"kind":"string","value":"No repair for supervisor deprecation\n### The problem\n\nA repair is not generated for a supervised system.\n\n## System Information\n\nversion | core-2025.6.0b0\n-- | --\ninstallation_type | Home Assistant Supervised\ndev | false\nhassio | true\ndocker | true\nuser | root\nvirtualenv | false\npython_version | 3.13.3\nos_name | Linux\nos_version | 6.1.0-26-amd64\narch | x86_64\ntimezone | America/New_York\nconfig_dir | /config\n\n<details><summary>Home Assistant Community Store</summary>\n\nGitHub API | ok\n-- | --\nGitHub Content | ok\nGitHub Web | ok\nHACS Data | ok\nGitHub API Calls Remaining | 4993\nInstalled Version | 2.0.5\nStage | running\nAvailable Repositories | 1880\nDownloaded Repositories | 28\n\n</details>\n\n<details><summary>AccuWeather</summary>\n\ncan_reach_server | ok\n-- | --\nremaining_requests | 12\n\n</details>\n\n<details><summary>Home Assistant Cloud</summary>\n\nlogged_in | true\n-- | --\nsubscription_expiration | August 24, 2025 at 8:00 PM\nrelayer_connected | true\nrelayer_region | us-east-1\nremote_enabled | true\nremote_connected | true\nalexa_enabled | true\ngoogle_enabled | false\ncloud_ice_servers_enabled | false\nremote_server | us-east-1-9.ui.nabu.casa\ncertificate_status | ready\ninstance_id | cb8f11775bbe42878839a021bdcf890e\ncan_reach_cert_server | ok\ncan_reach_cloud_auth | ok\ncan_reach_cloud | ok\n\n</details>\n\n<details><summary>Home Assistant Supervisor</summary>\n\nhost_os | Debian GNU/Linux 12 (bookworm)\n-- | --\nupdate_channel | beta\nsupervisor_version | supervisor-2025.05.3\nagent_version | 1.2.0\ndocker_version | 27.3.1\ndisk_total | 219.9 GB\ndisk_used | 31.3 GB\nhealthy | true\nsupported | true\nhost_connectivity | true\nsupervisor_connectivity | true\nntp_synchronized | true\nvirtualization | \nsupervisor_api | ok\nversion_api | ok\ninstalled_addons | Samba share (12.5.1), Terminal & SSH (9.17.0), ESPHome Device Builder (2025.5.1), Z-Wave JS UI (4.3.1), Network UPS Tools (0.14.1), Samba Backup (5.2.0), AdGuard Home (5.2.9), Zigbee2MQTT (2.3.0-1), MariaDB (2.7.2), phpMyAdmin (0.11.1), Studio Code Server (5.19.3), Get HACS (1.3.1), ecowitt2mqtt (2024.10.0), Mosquitto broker (6.5.1)\n\n</details>\n\n<details><summary>Dashboards</summary>\n\ndashboards | 7\n-- | --\nresources | 11\nviews | 65\nmode | yaml\n\n</details>\n\n<details><summary>Network Configuration</summary>\n\nadapters | lo (disabled), eno1 (enabled, default, auto), docker0 (disabled), hassio (disabled), vethd12978d (disabled), vethc5092f2 (disabled), veth0632d56 (disabled), veth0501aaa (disabled), vetha533135 (disabled), veth83f9ca0 (disabled), veth6e6bcc0 (disabled), vethd8dcd71 (disabled), vethd4b4998 (disabled), veth4863af8 (disabled), vethee2c460 (disabled), veth1681e81 (disabled), vethc23cdf0 (disabled), veth791ed81 (disabled)\n-- | --\nipv4_addresses | lo (127.0.0.1/8), eno1 (192.168.1.134/24), docker0 (172.17.0.1/16), hassio (172.30.32.1/23), vethd12978d (), vethc5092f2 (), veth0632d56 (), veth0501aaa (), vetha533135 (), veth83f9ca0 (), veth6e6bcc0 (), vethd8dcd71 (), vethd4b4998 (), veth4863af8 (), vethee2c460 (), veth1681e81 (), vethc23cdf0 (), veth791ed81 ()\nipv6_addresses | lo (::1/128), eno1 (fe80::ea2d:c701:b86:361d/64), docker0 (fe80::42:3cff:fe10:17a8/64), hassio (fe80::42:dff:fea7:d90d/64), vethd12978d (fe80::e45e:75ff:fe8f:8df9/64), vethc5092f2 (fe80::78dc:e4ff:fec5:1926/64), veth0632d56 (fe80::c859:a4ff:fed8:c9b6/64), veth0501aaa (fe80::40ce:37ff:fef1:6d78/64), vetha533135 (fe80::b4d5:17ff:fe17:4479/64), veth83f9ca0 (fe80::a881:cfff:fe8e:5773/64), veth6e6bcc0 (fe80::1440:f8ff:fe7d:65e5/64), vethd8dcd71 (fe80::c88d:b1ff:fed1:da65/64), vethd4b4998 (fe80::f0e9:23ff:fe81:f7f7/64), veth4863af8 (fe80::d8e1:6ff:feea:186a/64), vethee2c460 (fe80::4878:eeff:fe08:bd47/64), veth1681e81 (fe80::86:4ff:fe06:6adb/64), vethc23cdf0 (fe80::a09d:6bff:fe7e:f95e/64), veth791ed81 (fe80::7074:15ff:fe70:7d0b/64)\nannounce_addresses | 192.168.1.134, fe80::ea2d:c701:b86:361d\n\n</details>\n\n<details><summary>Recorder</summary>\n\noldest_recorder_run | March 27, 2025 at 8:51 PM\n-- | --\ncurrent_recorder_run | May 27, 2025 at 7:10 AM\nestimated_db_size | 2173.64 MiB\ndatabase_engine | mysql\ndatabase_version | 10.11.6\n\n</details>\n\n<details><summary>Spotify</summary>\n\napi_endpoint_reachable | ok\n-- | --\n\n</details>\n\n### What version of Home Assistant Core has the issue?\n\ncore-2025.6.0b0\n\n### What was the last working version of Home Assistant Core?\n\nNA\n\n### What type of installation are you running?\n\nHome Assistant Supervised\n\n### Integration causing the issue\n\n_No response_\n\n### Link to integration documentation on our website\n\n_No response_\n\n### Diagnostics information\n\n_No response_\n\n### Example YAML snippet\n\n```yaml\n\n```\n\n### Anything in the logs that might be useful for us?\n\n```txt\n\n```\n\n### Additional information\n\n_No response_"},"hints_text":{"kind":"string","value":"supervisor logs\n```\n\n\u001b[32m2025-05-27 07:09:51.284 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 07:09:51.302 INFO (MainThread) [supervisor.homeassistant.core] Updating Home Assistant to version 2025.6.0b0\u001b[0m\n\u001b[32m2025-05-27 07:09:51.302 INFO (MainThread) [supervisor.docker.interface] Updating image ghcr.io/home-assistant/qemux86-64-homeassistant:2025.5.3 to ghcr.io/home-assistant/qemux86-64-homeassistant:2025.6.0b0\u001b[0m\n\u001b[32m2025-05-27 07:09:51.303 INFO (MainThread) [supervisor.docker.interface] Downloading docker image ghcr.io/home-assistant/qemux86-64-homeassistant with tag 2025.6.0b0.\u001b[0m\n\u001b[32m2025-05-27 07:10:36.330 INFO (SyncWorker_3) [supervisor.docker.manager] Stopping homeassistant application\u001b[0m\n\u001b[32m2025-05-27 07:10:47.323 INFO (SyncWorker_3) [supervisor.docker.manager] Cleaning homeassistant application\u001b[0m\n\u001b[32m2025-05-27 07:10:47.752 INFO (MainThread) [supervisor.homeassistant.module] Update pulse/client.config: /data/tmp/homeassistant_pulse\u001b[0m\n\u001b[32m2025-05-27 07:10:48.167 INFO (MainThread) [supervisor.docker.homeassistant] Starting Home Assistant ghcr.io/home-assistant/qemux86-64-homeassistant with version 2025.6.0b0\u001b[0m\n\u001b[32m2025-05-27 07:10:48.168 INFO (MainThread) [supervisor.homeassistant.core] Wait until Home Assistant is ready\u001b[0m\n\u001b[32m2025-05-27 07:10:53.205 INFO (MainThread) [supervisor.homeassistant.core] Home Assistant Core state changed to APIState(core_state='NOT_RUNNING', offline_db_migration=False)\u001b[0m\n\u001b[32m2025-05-27 07:10:53.226 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 07:10:53.331 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 07:11:10.466 INFO (MainThread) [supervisor.auth] Auth request from 'core_mosquitto' for 'homeassistant'\u001b[0m\n\u001b[32m2025-05-27 07:11:10.471 INFO (MainThread) [supervisor.auth] Home Assistant not running, checking cache\u001b[0m\n\u001b[32m2025-05-27 07:11:23.977 INFO (MainThread) [supervisor.homeassistant.core] Home Assistant Core state changed to APIState(core_state='RUNNING', offline_db_migration=False)\u001b[0m\n\u001b[32m2025-05-27 07:11:23.977 INFO (MainThread) [supervisor.homeassistant.core] Detect a running Home Assistant instance\u001b[0m\n\u001b[32m2025-05-27 07:11:23.977 INFO (MainThread) [supervisor.homeassistant.core] Successfully started Home Assistant 2025.6.0b0\u001b[0m\n\u001b[32m2025-05-27 07:11:24.031 INFO (SyncWorker_7) [supervisor.docker.manager] Cleanup images: ['ghcr.io/home-assistant/qemux86-64-homeassistant:2025.5.3']\u001b[0m\n\u001b[32m2025-05-27 07:33:10.563 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 07:33:10.564 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 07:33:10.564 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 07:33:10.564 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 07:33:10.565 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 07:33:10.565 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 07:33:10.584 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 07:33:10.662 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 07:33:10.663 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 07:33:10.663 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 07:33:10.663 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 07:33:10.663 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 07:33:10.663 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 07:33:10.728 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 07:33:10.729 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 07:33:10.729 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 07:33:14.914 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/core repository from https://github.com/home-assistant/addons\u001b[0m\n\u001b[32m2025-05-27 07:33:14.916 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/cb646a50 repository from https://github.com/hacs/addons\u001b[0m\n\u001b[32m2025-05-27 07:33:14.918 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/9cf1ea8f repository from https://github.com/GollumDom/addon-repository\u001b[0m\n\u001b[32m2025-05-27 07:33:14.929 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/c35f0383 repository from https://github.com/bachya/home-assistant-addons\u001b[0m\n\u001b[32m2025-05-27 07:33:14.933 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/d5369777 repository from https://github.com/music-assistant/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 07:33:14.933 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15ef4d2f repository from https://github.com/esphome/hassio\u001b[0m\n\u001b[32m2025-05-27 07:33:14.936 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/a0d7b954 repository from https://github.com/hassio-addons/repository\u001b[0m\n\u001b[32m2025-05-27 07:33:14.936 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/45df7312 repository from https://github.com/zigbee2mqtt/hassio-zigbee2mqtt\u001b[0m\n\u001b[32m2025-05-27 07:33:14.936 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/5c53de3b repository from https://github.com/esphome/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 07:33:14.939 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15d21743 repository from https://github.com/thomasmauerer/hassio-addons\u001b[0m\n\u001b[32m2025-05-27 07:33:15.927 INFO (MainThread) [supervisor.store] Loading add-ons from store: 97 all - 0 new - 0 remove\u001b[0m\n\u001b[32m2025-05-27 07:40:47.996 INFO (MainThread) [supervisor.docker.addon] Updating image ghcr.io/esphome/esphome-hassio:2025.5.0 to ghcr.io/esphome/esphome-hassio:2025.5.1\u001b[0m\n\u001b[32m2025-05-27 07:40:47.997 INFO (MainThread) [supervisor.docker.interface] Downloading docker image ghcr.io/esphome/esphome-hassio with tag 2025.5.1.\u001b[0m\n\u001b[32m2025-05-27 07:40:55.393 INFO (SyncWorker_3) [supervisor.docker.manager] Stopping addon_15ef4d2f_esphome application\u001b[0m\n\u001b[32m2025-05-27 07:41:02.939 INFO (SyncWorker_3) [supervisor.docker.manager] Cleaning addon_15ef4d2f_esphome application\u001b[0m\n\u001b[32m2025-05-27 07:41:03.029 INFO (MainThread) [supervisor.addons.addon] Add-on '15ef4d2f_esphome' successfully updated\u001b[0m\n\u001b[32m2025-05-27 07:41:03.103 INFO (SyncWorker_8) [supervisor.docker.manager] Cleanup images: ['ghcr.io/esphome/esphome-hassio:2025.5.0']\u001b[0m\n\u001b[32m2025-05-27 07:41:03.907 INFO (MainThread) [supervisor.docker.addon] Starting Docker add-on ghcr.io/esphome/esphome-hassio with version 2025.5.1\u001b[0m\n\u001b[32m2025-05-27 07:41:03.912 INFO (MainThread) [supervisor.updater] Fetching update data from https://version.home-assistant.io/beta.json\u001b[0m\n\u001b[32m2025-05-27 07:41:03.920 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15d21743 repository from https://github.com/thomasmauerer/hassio-addons\u001b[0m\n\u001b[32m2025-05-27 07:41:03.920 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/cb646a50 repository from https://github.com/hacs/addons\u001b[0m\n\u001b[32m2025-05-27 07:41:03.923 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/core repository from https://github.com/home-assistant/addons\u001b[0m\n\u001b[32m2025-05-27 07:41:03.927 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/5c53de3b repository from https://github.com/esphome/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 07:41:03.928 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/9cf1ea8f repository from https://github.com/GollumDom/addon-repository\u001b[0m\n\u001b[32m2025-05-27 07:41:03.933 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/c35f0383 repository from https://github.com/bachya/home-assistant-addons\u001b[0m\n\u001b[32m2025-05-27 07:41:03.934 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/d5369777 repository from https://github.com/music-assistant/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 07:41:03.934 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15ef4d2f repository from https://github.com/esphome/hassio\u001b[0m\n\u001b[32m2025-05-27 07:41:03.940 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/a0d7b954 repository from https://github.com/hassio-addons/repository\u001b[0m\n\u001b[32m2025-05-27 07:41:03.940 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/45df7312 repository from https://github.com/zigbee2mqtt/hassio-zigbee2mqtt\u001b[0m\n\u001b[32m2025-05-27 08:33:10.738 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 08:33:10.739 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 08:33:10.739 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 08:33:10.739 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 08:33:10.740 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 08:33:10.740 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 08:33:10.748 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 08:33:10.806 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 08:33:10.807 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 08:33:10.807 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 08:33:10.808 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 08:33:10.808 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 08:33:10.808 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 08:33:10.922 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 08:33:10.922 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 08:33:10.922 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 08:33:10.925 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 09:13:09.692 INFO (MainThread) [supervisor.host.info] Updating local host information\u001b[0m\n\u001b[32m2025-05-27 09:13:09.984 INFO (MainThread) [supervisor.jobs] 'OSManager.reload' blocked from execution, no Home Assistant OS available\u001b[0m\n\u001b[32m2025-05-27 09:13:09.985 INFO (MainThread) [supervisor.host.services] Updating service information\u001b[0m\n\u001b[32m2025-05-27 09:13:09.987 INFO (MainThread) [supervisor.host.network] Updating local network information\u001b[0m\n\u001b[32m2025-05-27 09:13:10.039 INFO (MainThread) [supervisor.host.sound] Updating PulseAudio information\u001b[0m\n\u001b[32m2025-05-27 09:13:10.045 INFO (MainThread) [supervisor.host.manager] Host information reload completed\u001b[0m\n\u001b[32m2025-05-27 09:33:10.933 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 09:33:10.934 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 09:33:10.934 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 09:33:10.934 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 09:33:10.935 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 09:33:10.935 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 09:33:10.955 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 09:33:11.033 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 09:33:11.034 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 09:33:11.034 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 09:33:11.034 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 09:33:11.034 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 09:33:11.034 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 09:33:11.095 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 09:33:11.095 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 09:33:11.095 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 09:33:11.098 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 10:33:11.104 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 10:33:11.104 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 10:33:11.104 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 10:33:11.104 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 10:33:11.105 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 10:33:11.105 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 10:33:11.111 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 10:33:11.203 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 10:33:11.204 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 10:33:11.205 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 10:33:11.205 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 10:33:11.205 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 10:33:11.205 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 10:33:11.295 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 10:33:11.296 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 10:33:11.296 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 10:33:11.299 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 10:33:15.943 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/core repository from https://github.com/home-assistant/addons\u001b[0m\n\u001b[32m2025-05-27 10:33:15.945 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15ef4d2f repository from https://github.com/esphome/hassio\u001b[0m\n\u001b[32m2025-05-27 10:33:15.946 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/9cf1ea8f repository from https://github.com/GollumDom/addon-repository\u001b[0m\n\u001b[32m2025-05-27 10:33:15.946 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/c35f0383 repository from https://github.com/bachya/home-assistant-addons\u001b[0m\n\u001b[32m2025-05-27 10:33:15.955 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/cb646a50 repository from https://github.com/hacs/addons\u001b[0m\n\u001b[32m2025-05-27 10:33:15.956 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15d21743 repository from https://github.com/thomasmauerer/hassio-addons\u001b[0m\n\u001b[32m2025-05-27 10:33:15.957 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/5c53de3b repository from https://github.com/esphome/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 10:33:15.962 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/d5369777 repository from https://github.com/music-assistant/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 10:33:15.962 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/a0d7b954 repository from https://github.com/hassio-addons/repository\u001b[0m\n\u001b[32m2025-05-27 10:33:15.965 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/45df7312 repository from https://github.com/zigbee2mqtt/hassio-zigbee2mqtt\u001b[0m\n\u001b[32m2025-05-27 10:52:56.545 INFO (MainThread) [supervisor.updater] Fetching update data from https://version.home-assistant.io/beta.json\u001b[0m\n\u001b[32m2025-05-27 11:19:50.058 INFO (MainThread) [supervisor.host.info] Updating local host information\u001b[0m\n\u001b[32m2025-05-27 11:19:50.322 INFO (MainThread) [supervisor.jobs] 'OSManager.reload' blocked from execution, no Home Assistant OS available\u001b[0m\n\u001b[32m2025-05-27 11:19:50.322 INFO (MainThread) [supervisor.host.services] Updating service information\u001b[0m\n\u001b[32m2025-05-27 11:19:50.325 INFO (MainThread) [supervisor.host.network] Updating local network information\u001b[0m\n\u001b[32m2025-05-27 11:19:50.391 INFO (MainThread) [supervisor.host.sound] Updating PulseAudio information\u001b[0m\n\u001b[32m2025-05-27 11:19:50.395 INFO (MainThread) [supervisor.host.manager] Host information reload completed\u001b[0m\n\u001b[32m2025-05-27 11:33:11.306 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 11:33:11.307 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 11:33:11.307 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 11:33:11.307 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 11:33:11.308 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 11:33:11.308 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 11:33:11.315 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 11:33:11.399 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 11:33:11.400 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 11:33:11.401 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 11:33:11.401 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 11:33:11.402 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 11:33:11.402 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 11:33:11.505 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 11:33:11.505 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 11:33:11.505 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 11:33:11.508 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 12:33:11.516 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 12:33:11.517 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 12:33:11.517 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 12:33:11.517 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 12:33:11.517 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 12:33:11.518 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 12:33:11.523 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 12:33:11.597 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 12:33:11.598 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 12:33:11.599 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 12:33:11.599 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 12:33:11.599 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 12:33:11.599 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 12:33:11.664 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 12:33:11.665 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 12:33:11.665 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 12:33:11.668 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 13:26:30.408 INFO (MainThread) [supervisor.host.info] Updating local host information\u001b[0m\n\u001b[32m2025-05-27 13:26:30.675 INFO (MainThread) [supervisor.jobs] 'OSManager.reload' blocked from execution, no Home Assistant OS available\u001b[0m\n\u001b[32m2025-05-27 13:26:30.675 INFO (MainThread) [supervisor.host.services] Updating service information\u001b[0m\n\u001b[32m2025-05-27 13:26:30.678 INFO (MainThread) [supervisor.host.network] Updating local network information\u001b[0m\n\u001b[32m2025-05-27 13:26:30.728 INFO (MainThread) [supervisor.host.sound] Updating PulseAudio information\u001b[0m\n\u001b[32m2025-05-27 13:26:30.745 INFO (MainThread) [supervisor.host.manager] Host information reload completed\u001b[0m\n\u001b[32m2025-05-27 13:33:11.676 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 13:33:11.676 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 13:33:11.676 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 13:33:11.676 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 13:33:11.677 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 13:33:11.677 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 13:33:11.682 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 13:33:11.749 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 13:33:11.751 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 13:33:11.751 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 13:33:11.751 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 13:33:11.751 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 13:33:11.752 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 13:33:11.834 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 13:33:11.834 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 13:33:11.834 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 13:33:11.838 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-27 13:33:16.665 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/45df7312 repository from https://github.com/zigbee2mqtt/hassio-zigbee2mqtt\u001b[0m\n\u001b[32m2025-05-27 13:33:16.669 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/core repository from https://github.com/home-assistant/addons\u001b[0m\n\u001b[32m2025-05-27 13:33:16.670 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/c35f0383 repository from https://github.com/bachya/home-assistant-addons\u001b[0m\n\u001b[32m2025-05-27 13:33:16.677 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/a0d7b954 repository from https://github.com/hassio-addons/repository\u001b[0m\n\u001b[32m2025-05-27 13:33:16.678 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/5c53de3b repository from https://github.com/esphome/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 13:33:16.679 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/9cf1ea8f repository from https://github.com/GollumDom/addon-repository\u001b[0m\n\u001b[32m2025-05-27 13:33:16.680 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15ef4d2f repository from https://github.com/esphome/hassio\u001b[0m\n\u001b[32m2025-05-27 13:33:16.680 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15d21743 repository from https://github.com/thomasmauerer/hassio-addons\u001b[0m\n\u001b[32m2025-05-27 13:33:16.681 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/d5369777 repository from https://github.com/music-assistant/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 13:33:16.688 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/cb646a50 repository from https://github.com/hacs/addons\u001b[0m\n\u001b[32m2025-05-27 13:51:41.534 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/9cf1ea8f repository from https://github.com/GollumDom/addon-repository\u001b[0m\n\u001b[32m2025-05-27 13:51:41.535 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15d21743 repository from https://github.com/thomasmauerer/hassio-addons\u001b[0m\n\u001b[32m2025-05-27 13:51:41.535 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/core repository from https://github.com/home-assistant/addons\u001b[0m\n\u001b[32m2025-05-27 13:51:41.538 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/cb646a50 repository from https://github.com/hacs/addons\u001b[0m\n\u001b[32m2025-05-27 13:51:41.538 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/45df7312 repository from https://github.com/zigbee2mqtt/hassio-zigbee2mqtt\u001b[0m\n\u001b[32m2025-05-27 13:51:41.538 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/c35f0383 repository from https://github.com/bachya/home-assistant-addons\u001b[0m\n\u001b[32m2025-05-27 13:51:41.541 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/15ef4d2f repository from https://github.com/esphome/hassio\u001b[0m\n\u001b[32m2025-05-27 13:51:41.542 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/d5369777 repository from https://github.com/music-assistant/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 13:51:41.542 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/5c53de3b repository from https://github.com/esphome/home-assistant-addon\u001b[0m\n\u001b[32m2025-05-27 13:51:41.553 INFO (MainThread) [supervisor.store.git] Update add-on /data/addons/git/a0d7b954 repository from https://github.com/hassio-addons/repository\u001b[0m\n\u001b[32m2025-05-27 13:51:41.615 INFO (MainThread) [supervisor.updater] Fetching update data from https://version.home-assistant.io/beta.json\u001b[0m\n\u001b[32m2025-05-27 14:33:11.846 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-27 14:33:11.846 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-27 14:33:11.846 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-27 14:33:11.846 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-27 14:33:11.847 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-27 14:33:11.847 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-27 14:33:11.853 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-27 14:33:11.931 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-27 14:33:11.932 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-27 14:33:11.932 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-27 14:33:11.933 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-27 14:33:11.933 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-27 14:33:11.933 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-27 14:33:12.015 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-27 14:33:12.015 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-27 14:33:12.015 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m\n\u001b[32m2025-05-27 14:33:12.018 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\n````\nSame here, but also no deprecating repair for armv7\n\n## System Information\n\nversion | core-2025.6.0b1\n-- | --\ninstallation_type | Home Assistant Supervised\ndev | false\nhassio | true\ndocker | true\nuser | root\nvirtualenv | false\npython_version | 3.13.3\nos_name | Linux\nos_version | 6.1.21-v7+\narch | armv7l\ntimezone | Europe/Brussels\nconfig_dir | /config\n\n<details><summary>Home Assistant Community Store</summary>\n\nGitHub API | ok\n-- | --\nGitHub Content | ok\nGitHub Web | ok\nHACS Data | ok\nGitHub API Calls Remaining | 4998\nInstalled Version | 2.0.5\nStage | running\nAvailable Repositories | 1975\nDownloaded Repositories | 6\n\n</details>\n\n<details><summary>Home Assistant Cloud</summary>\n\nlogged_in | false\n-- | --\ncan_reach_cert_server | ok\ncan_reach_cloud_auth | ok\ncan_reach_cloud | ok\n\n</details>\n\n<details><summary>Home Assistant Supervisor</summary>\n\nhost_os | Debian GNU/Linux 12 (bookworm)\n-- | --\nupdate_channel | stable\nsupervisor_version | supervisor-2025.05.3\nagent_version | 1.7.2\ndocker_version | 28.0.1\ndisk_total | 228.2 GB\ndisk_used | 46.6 GB\nhealthy | true\nsupported | true\nhost_connectivity | true\nsupervisor_connectivity | true\nntp_synchronized | true\nvirtualization | \nsupervisor_api | ok\nversion_api | ok\ninstalled_addons | File editor (5.8.0), Home Assistant Google Drive Backup (0.112.1), TasmoAdmin (0.31.5), Samba Backup (5.2.0), zigbee2mqttassistant-dev (0.3.178), Alsa & PulseAudio Fix dev version (3.5), motionEye (0.22.1), Zigbee2MQTT (2.3.0-1), Portainer (2.30.1), MQTT Explorer (browser-1.0.3)\n\n</details>\n\n<details><summary>Dashboards</summary>\n\ndashboards | 4\n-- | --\nresources | 1\nviews | 3\nmode | storage\n\n</details>\n\n<details><summary>Network Configuration</summary>\n\nadapters | lo (disabled), eth0 (enabled, default, auto), docker0 (disabled), hassio (disabled)\n-- | --\nipv4_addresses | lo (127.0.0.1/8), eth0 (10.0.0.52/24), docker0 (172.17.0.1/16), hassio (172.30.32.1/23)\nipv6_addresses | lo (::1/128), eth0 (2a02:578:85db:1800:956c:e169:6835:cfdd/128, fe80::956c:e169:6835:cfdd/64), docker0 (), hassio ()\nannounce_addresses | 10.0.0.52, 2a02:578:85db:1800:956c:e169:6835:cfdd, fe80::956c:e169:6835:cfdd\n\n</details>\n\n<details><summary>Recorder</summary>\n\noldest_recorder_run | 8 May 2025 at 10:00\n-- | --\ncurrent_recorder_run | 28 May 2025 at 16:57\nestimated_db_size | 454.01 MiB\ndatabase_engine | sqlite\ndatabase_version | 3.48.0\n\n</details>\nSupervisor log:\n\n/package/admin/s6-overlay/libexec/preinit: info: read-only root\n/package/admin/s6-overlay/libexec/preinit: info: writable /run. Checking for executability.\n/package/admin/s6-overlay/libexec/preinit: warning: unable to find /run in /proc/mounts, check that your container manager pre-mounts /proc, and that /run is a tmpfs. The container is likely to crash soon, if /run is (incorrectly) mounted noexec.\ns6-rc: info: service s6rc-oneshot-runner: starting\ns6-rc: info: service s6rc-oneshot-runner successfully started\ns6-rc: info: service fix-attrs: starting\ns6-rc: info: service fix-attrs successfully started\ns6-rc: info: service legacy-cont-init: starting\ncont-init: info: running /etc/cont-init.d/udev.sh\n[14:49:23] INFO: \u001b[32mUsing udev information from host\u001b[0m\ncont-init: info: /etc/cont-init.d/udev.sh exited 0\ns6-rc: info: service legacy-cont-init successfully started\ns6-rc: info: service legacy-services: starting\nservices-up: info: copying legacy longrun supervisor (no readiness notification)\nservices-up: info: copying legacy longrun watchdog (no readiness notification)\ns6-rc: info: service legacy-services successfully started\n[14:49:23] INFO: \u001b[32mStarting local supervisor watchdog...\u001b[0m\n\u001b[32m2025-05-28 14:49:38.959 INFO (MainThread) [__main__] Initializing Supervisor setup\u001b[0m\n\u001b[32m2025-05-28 14:49:39.766 INFO (MainThread) [supervisor.coresys] Setting up coresys for machine: raspberrypi2\u001b[0m\n\u001b[32m2025-05-28 14:49:39.766 INFO (MainThread) [supervisor.utils.sentry] Initializing Supervisor Sentry\u001b[0m\n\u001b[32m2025-05-28 16:49:39.932 INFO (MainThread) [supervisor.docker.supervisor] Attaching to Supervisor ghcr.io/home-assistant/armv7-hassio-supervisor with version 2025.05.3\u001b[0m\n\u001b[32m2025-05-28 16:49:40.241 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state initialize\u001b[0m\n\u001b[32m2025-05-28 16:49:40.257 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-28 16:49:40.261 INFO (MainThread) [__main__] Setting up Supervisor\u001b[0m\n\u001b[32m2025-05-28 16:49:40.715 INFO (MainThread) [supervisor.api] Starting API on 172.30.32.2\u001b[0m\n\u001b[32m2025-05-28 16:49:41.065 INFO (MainThread) [supervisor.hardware.monitor] Started Supervisor hardware monitor\u001b[0m\n\u001b[32m2025-05-28 16:49:41.077 INFO (MainThread) [supervisor.dbus.manager] Connected to system D-Bus.\u001b[0m\n\u001b[32m2025-05-28 16:49:41.081 INFO (MainThread) [supervisor.dbus.agent] Load dbus interface io.hass.os\u001b[0m\n\u001b[32m2025-05-28 16:49:41.085 INFO (MainThread) [supervisor.dbus.hostname] Load dbus interface org.freedesktop.hostname1\u001b[0m\n\u001b[32m2025-05-28 16:49:41.093 INFO (MainThread) [supervisor.dbus.logind] Load dbus interface org.freedesktop.login1\u001b[0m\n\u001b[32m2025-05-28 16:49:41.098 INFO (MainThread) [supervisor.dbus.network] Load dbus interface org.freedesktop.NetworkManager\u001b[0m\n\u001b[32m2025-05-28 16:49:41.102 INFO (MainThread) [supervisor.dbus.rauc] Load dbus interface de.pengutronix.rauc\u001b[0m\n\u001b[32m2025-05-28 16:49:41.107 INFO (MainThread) [supervisor.dbus.resolved] Load dbus interface org.freedesktop.resolve1\u001b[0m\n\u001b[32m2025-05-28 16:49:41.112 INFO (MainThread) [supervisor.dbus.systemd] Load dbus interface org.freedesktop.systemd1\u001b[0m\n\u001b[32m2025-05-28 16:49:41.118 INFO (MainThread) [supervisor.dbus.timedate] Load dbus interface org.freedesktop.timedate1\u001b[0m\n\u001b[33m2025-05-28 16:49:41.271 WARNING (MainThread) [supervisor.dbus.rauc] Host has no rauc support. OTA updates have been disabled.\u001b[0m\n\u001b[32m2025-05-28 16:49:42.431 INFO (MainThread) [supervisor.host.services] Updating service information\u001b[0m\n\u001b[32m2025-05-28 16:49:42.462 INFO (MainThread) [supervisor.host.sound] Updating PulseAudio information\u001b[0m\n\u001b[33m2025-05-28 16:49:42.559 WARNING (SyncWorker_3) [supervisor.host.sound] Can't update PulseAudio data: Failed to connect to pulseaudio server\u001b[0m\n\u001b[32m2025-05-28 16:49:43.152 INFO (MainThread) [supervisor.host.network] Updating local network information\u001b[0m\n\u001b[32m2025-05-28 16:49:43.628 INFO (MainThread) [supervisor.host.apparmor] Loading AppArmor Profiles: {'db21ed7f_portainer', 'hassio-supervisor'}\u001b[0m\n\u001b[32m2025-05-28 16:49:43.749 INFO (MainThread) [supervisor.docker.monitor] Started docker events monitor\u001b[0m\n\u001b[32m2025-05-28 16:49:43.751 INFO (MainThread) [supervisor.updater] Fetching update data from https://version.home-assistant.io/stable.json\u001b[0m\n\u001b[32m2025-05-28 16:49:44.150 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/home-assistant/armv7-hassio-cli with version 2025.04.0\u001b[0m\n\u001b[32m2025-05-28 16:49:44.206 INFO (MainThread) [supervisor.plugins.cli] Starting CLI plugin\u001b[0m\n\u001b[32m2025-05-28 16:49:45.784 INFO (MainThread) [supervisor.docker.cli] Starting CLI ghcr.io/home-assistant/armv7-hassio-cli with version 2025.04.0 - 172.30.32.5\u001b[0m\n\u001b[32m2025-05-28 16:49:46.006 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/home-assistant/armv7-hassio-dns with version 2025.02.0\u001b[0m\n\u001b[32m2025-05-28 16:49:46.198 INFO (MainThread) [supervisor.plugins.dns] Starting CoreDNS plugin\u001b[0m\n\u001b[32m2025-05-28 16:49:48.065 INFO (MainThread) [supervisor.docker.dns] Starting DNS ghcr.io/home-assistant/armv7-hassio-dns with version 2025.02.0 - 172.30.32.3\u001b[0m\n\u001b[32m2025-05-28 16:49:48.076 INFO (MainThread) [supervisor.plugins.dns] Updated /etc/resolv.conf\u001b[0m\n\u001b[32m2025-05-28 16:49:48.259 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/home-assistant/armv7-hassio-audio with version 2025.02.0\u001b[0m\n\u001b[32m2025-05-28 16:49:48.317 INFO (MainThread) [supervisor.plugins.audio] Starting Audio plugin\u001b[0m\n\u001b[32m2025-05-28 16:49:50.403 INFO (MainThread) [supervisor.docker.audio] Starting Audio ghcr.io/home-assistant/armv7-hassio-audio with version 2025.02.0 - 172.30.32.4\u001b[0m\n\u001b[32m2025-05-28 16:49:50.433 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/home-assistant/armv7-hassio-observer with version 2025.02.0\u001b[0m\n\u001b[32m2025-05-28 16:49:50.708 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/home-assistant/armv7-hassio-multicast with version 2025.02.0\u001b[0m\n\u001b[32m2025-05-28 16:49:50.877 INFO (MainThread) [supervisor.plugins.multicast] Starting Multicast plugin\u001b[0m\n\u001b[32m2025-05-28 16:49:53.692 INFO (MainThread) [supervisor.docker.multicast] Starting Multicast ghcr.io/home-assistant/armv7-hassio-multicast with version 2025.02.0 - Host\u001b[0m\n\u001b[32m2025-05-28 16:49:53.786 INFO (MainThread) [supervisor.homeassistant.secrets] Loaded 1 Home Assistant secrets\u001b[0m\n\u001b[32m2025-05-28 16:49:54.205 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/home-assistant/raspberrypi2-homeassistant with version 2025.6.0b1\u001b[0m\n\u001b[32m2025-05-28 16:49:54.354 INFO (MainThread) [supervisor.os.manager] No Home Assistant Operating System found\u001b[0m\n\u001b[32m2025-05-28 16:49:54.571 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/00185a40 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.589 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/f4f71350 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.622 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/4a36bbd1 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.658 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/a0d7b954 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.676 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/3983e8d8 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.687 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/db21ed7f repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.694 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/15d21743 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.702 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/773cbd65 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.736 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/243ffc37 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.755 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/5c53de3b repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.790 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/89275b70 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.825 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/f3248fb7 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.857 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/9cf1ea8f repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.865 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/806b11b5 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.882 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/8a3a5726 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.887 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/de91e161 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.933 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/cebe7a76 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.970 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/d5369777 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.981 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/d4868bb1 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:54.986 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/f1c878cb repository\u001b[0m\n\u001b[32m2025-05-28 16:49:55.007 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/git/45df7312 repository\u001b[0m\n\u001b[32m2025-05-28 16:49:55.046 INFO (MainThread) [supervisor.store.git] Loading add-on /data/addons/core repository\u001b[0m\n\u001b[33m2025-05-28 16:54:54.792 WARNING (SyncWorker_4) [supervisor.addons.validate] Add-on config 'startup' with 'before' is deprecated. Please report this to the maintainer of RTL_433 to MQTT Bridge\u001b[0m\n\u001b[33m2025-05-28 16:54:54.793 WARNING (SyncWorker_4) [supervisor.addons.validate] Add-on config 'devices' use a deprecated format, the new format uses a list of paths only. Please report this to the maintainer of RTL_433 to MQTT Bridge\u001b[0m\n\u001b[33m2025-05-28 16:54:54.802 WARNING (SyncWorker_4) [supervisor.addons.validate] Add-on config 'startup' with 'before' is deprecated. Please report this to the maintainer of ink to MQTT\u001b[0m\n\u001b[33m2025-05-28 16:54:54.803 WARNING (SyncWorker_4) [supervisor.addons.validate] Add-on config 'devices' use a deprecated format, the new format uses a list of paths only. Please report this to the maintainer of ink to MQTT\u001b[0m\n\u001b[33m2025-05-28 16:54:54.812 WARNING (SyncWorker_4) [supervisor.addons.validate] Add-on config 'startup' with 'before' is deprecated. Please report this to the maintainer of Dasher\u001b[0m\n\u001b[33m2025-05-28 16:54:54.820 WARNING (SyncWorker_4) [supervisor.addons.validate] Add-on config 'startup' with 'before' is deprecated. Please report this to the maintainer of Grafana\u001b[0m\n\u001b[32m2025-05-28 16:55:02.563 INFO (MainThread) [supervisor.store] Loading add-ons from store: 245 all - 245 new - 0 remove\u001b[0m\n\u001b[32m2025-05-28 16:55:03.216 INFO (MainThread) [supervisor.addons.manager] Found 10 installed add-ons\u001b[0m\n\u001b[32m2025-05-28 16:55:03.734 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/sabeechen/hassio-google-drive-backup-armv7 with version 0.112.1\u001b[0m\n\u001b[32m2025-05-28 16:55:03.842 INFO (MainThread) [supervisor.docker.interface] Attaching to d4868bb1/armv7-addon-pulseaudio_fix_dev with version 3.5\u001b[0m\n\u001b[32m2025-05-28 16:55:03.911 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/hassio-addons/motioneye/armv7 with version 0.22.1\u001b[0m\n\u001b[32m2025-05-28 16:55:04.032 INFO (MainThread) [supervisor.docker.interface] Attaching to homeassistant/armv7-addon-configurator with version 5.8.0\u001b[0m\n\u001b[32m2025-05-28 16:55:04.141 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/alexbelgium/portainer-armv7 with version 2.30.1\u001b[0m\n\u001b[32m2025-05-28 16:55:04.214 INFO (MainThread) [supervisor.docker.interface] Attaching to thomasmauerer/samba-backup-armv7 with version 5.2.0\u001b[0m\n\u001b[32m2025-05-28 16:55:04.320 INFO (MainThread) [supervisor.docker.interface] Attaching to smeagolworms4/mqtt-explorer with version browser-1.0.3\u001b[0m\n\u001b[32m2025-05-28 16:55:04.369 INFO (MainThread) [supervisor.docker.interface] Attaching to carldebilly/zigbee2mqttassistant with version 0.3.178\u001b[0m\n\u001b[32m2025-05-28 16:55:04.460 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/hassio-addons/tasmoadmin/armv7 with version 0.31.5\u001b[0m\n\u001b[32m2025-05-28 16:55:04.648 INFO (MainThread) [supervisor.docker.interface] Attaching to ghcr.io/zigbee2mqtt/zigbee2mqtt-armv7 with version 2.3.0-1\u001b[0m\n\u001b[32m2025-05-28 16:55:05.414 INFO (MainThread) [supervisor.docker.interface] Image carldebilly/zigbee2mqttassistant:0.3.178 has arch linux/arm, expected linux/arm/v7. Reinstalling.\u001b[0m\n\u001b[32m2025-05-28 16:55:05.572 INFO (SyncWorker_0) [supervisor.docker.manager] Removing image carldebilly/zigbee2mqttassistant with latest\u001b[0m\n\u001b[32m2025-05-28 16:55:05.591 INFO (SyncWorker_0) [supervisor.docker.manager] Removing image carldebilly/zigbee2mqttassistant with 0.3.178\u001b[0m\n\u001b[32m2025-05-28 16:55:08.016 INFO (MainThread) [supervisor.docker.interface] Downloading docker image carldebilly/zigbee2mqttassistant with tag 0.3.178.\u001b[0m\n\u001b[32m2025-05-28 16:56:32.892 INFO (MainThread) [supervisor.backups.manager] Found 14 backup files\u001b[0m\n\u001b[31m2025-05-28 16:56:32.912 ERROR (MainThread) [supervisor.backups.backup] Can't read backup tarfile /data/backup/af29b463.tar: \"filename './backup.json' not found\"\u001b[0m\n\u001b[31m2025-05-28 16:56:32.950 ERROR (MainThread) [supervisor.backups.backup] Can't read backup tarfile /data/backup/096d430c.tar: \"filename './backup.json' not found\"\u001b[0m\n\u001b[31m2025-05-28 16:56:32.977 ERROR (MainThread) [supervisor.backups.backup] Can't read backup tarfile /data/backup/bacc4cc3.tar: \"filename './backup.json' not found\"\u001b[0m\n\u001b[32m2025-05-28 16:56:33.681 INFO (MainThread) [supervisor.discovery] Loaded 1 messages\u001b[0m\n\u001b[32m2025-05-28 16:56:33.682 INFO (MainThread) [supervisor.ingress] Loaded 0 ingress sessions\u001b[0m\n\u001b[32m2025-05-28 16:56:33.683 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state setup\u001b[0m\n\u001b[32m2025-05-28 16:56:33.684 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-28 16:56:33.685 INFO (MainThread) [supervisor.resolution.checks.base] Run check for detached_addon_removed/addon\u001b[0m\n\u001b[32m2025-05-28 16:56:33.686 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-28 16:56:33.696 INFO (MainThread) [supervisor.resolution.checks.base] Run check for detached_addon_missing/addon\u001b[0m\n\u001b[32m2025-05-28 16:56:33.697 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-28 16:56:33.698 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state setup\u001b[0m\n\u001b[32m2025-05-28 16:56:33.700 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-28 16:56:33.701 INFO (MainThread) [supervisor.jobs] 'ResolutionFixup.run_autofix' blocked from execution, system is not running - setup\u001b[0m\n\u001b[32m2025-05-28 16:56:33.717 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state setup\u001b[0m\n\u001b[32m2025-05-28 16:56:33.719 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-28 16:56:33.723 INFO (MainThread) [__main__] Running Supervisor\u001b[0m\n\u001b[32m2025-05-28 16:56:33.737 INFO (MainThread) [supervisor.jobs] 'OSManager.mark_healthy' blocked from execution, no Home Assistant OS available\u001b[0m\n\u001b[32m2025-05-28 16:56:33.738 INFO (MainThread) [supervisor.addons.manager] Phase 'initialize' starting 0 add-ons\u001b[0m\n\u001b[32m2025-05-28 16:56:33.757 INFO (MainThread) [supervisor.addons.manager] Phase 'system' starting 0 add-ons\u001b[0m\n\u001b[32m2025-05-28 16:56:33.759 INFO (MainThread) [supervisor.addons.manager] Phase 'services' starting 0 add-ons\u001b[0m\n\u001b[32m2025-05-28 16:56:33.809 INFO (MainThread) [supervisor.core] Start Home Assistant Core\u001b[0m\n\u001b[32m2025-05-28 16:56:33.971 INFO (SyncWorker_2) [supervisor.docker.manager] Starting homeassistant\u001b[0m\n\u001b[32m2025-05-28 16:56:35.269 INFO (MainThread) [supervisor.homeassistant.core] Wait until Home Assistant is ready\u001b[0m\n\u001b[32m2025-05-28 16:57:37.205 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state startup\u001b[0m\n\u001b[32m2025-05-28 16:57:37.207 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-28 16:57:40.673 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token\u001b[0m\n\u001b[32m2025-05-28 16:57:40.690 INFO (MainThread) [supervisor.homeassistant.core] Home Assistant Core state changed to APIState(core_state='NOT_RUNNING', offline_db_migration=False)\u001b[0m\n\u001b[32m2025-05-28 17:00:11.418 INFO (MainThread) [supervisor.homeassistant.core] Home Assistant Core state changed to APIState(core_state='RUNNING', offline_db_migration=False)\u001b[0m\n\u001b[32m2025-05-28 17:00:11.419 INFO (MainThread) [supervisor.homeassistant.core] Detect a running Home Assistant instance\u001b[0m\n\u001b[32m2025-05-28 17:00:11.421 INFO (MainThread) [supervisor.addons.manager] Phase 'application' starting 3 add-ons\u001b[0m\n\u001b[32m2025-05-28 17:00:19.382 INFO (MainThread) [supervisor.docker.addon] Starting Docker add-on homeassistant/armv7-addon-configurator with version 5.8.0\u001b[0m\n\u001b[32m2025-05-28 17:00:22.951 INFO (MainThread) [supervisor.docker.addon] Starting Docker add-on ghcr.io/sabeechen/hassio-google-drive-backup-armv7 with version 0.112.1\u001b[0m\n\u001b[32m2025-05-28 17:00:28.280 INFO (MainThread) [supervisor.docker.addon] Starting Docker add-on ghcr.io/hassio-addons/motioneye/armv7 with version 0.22.1\u001b[0m\n\u001b[32m2025-05-28 17:00:49.936 INFO (MainThread) [supervisor.api.middleware.security] /core/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:49.961 INFO (MainThread) [supervisor.api.middleware.security] /supervisor/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:50.000 INFO (MainThread) [supervisor.api.middleware.security] /mounts access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:50.035 INFO (MainThread) [supervisor.api.middleware.security] /addons access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:50.328 INFO (MainThread) [supervisor.api.middleware.security] /supervisor/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.153 INFO (MainThread) [supervisor.api.middleware.security] /backups access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.182 INFO (MainThread) [supervisor.api.middleware.security] /backups/c3b2033b/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.203 INFO (MainThread) [supervisor.api.middleware.security] /backups/f1ef8130/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.231 INFO (MainThread) [supervisor.api.middleware.security] /backups/2c114db6/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.253 INFO (MainThread) [supervisor.api.middleware.security] /backups/35f88a8b/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.280 INFO (MainThread) [supervisor.api.middleware.security] /backups/d9812210/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.305 INFO (MainThread) [supervisor.api.middleware.security] /backups/c822e97d/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.327 INFO (MainThread) [supervisor.api.middleware.security] /backups/ef120d8e/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.346 INFO (MainThread) [supervisor.api.middleware.security] /backups/868d1d62/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.367 INFO (MainThread) [supervisor.api.middleware.security] /backups/e41540c1/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.393 INFO (MainThread) [supervisor.api.middleware.security] /backups/4a6ceb8f/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:51.413 INFO (MainThread) [supervisor.api.middleware.security] /backups/14cbf653/info access from cebe7a76_hassio_google_drive_backup\u001b[0m\n\u001b[32m2025-05-28 17:00:54.631 INFO (MainThread) [supervisor.misc.tasks] All core tasks are scheduled\u001b[0m\n\u001b[32m2025-05-28 17:00:54.635 INFO (MainThread) [supervisor.host.info] Updating local host information\u001b[0m\n\u001b[32m2025-05-28 17:00:54.801 INFO (MainThread) [supervisor.resolution.check] Starting system checks with state running\u001b[0m\n\u001b[32m2025-05-28 17:00:54.805 INFO (MainThread) [supervisor.resolution.checks.base] Run check for disabled_data_disk/system\u001b[0m\n\u001b[32m2025-05-28 17:00:54.807 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_failed/dns_server\u001b[0m\n\u001b[32m2025-05-28 17:00:54.917 INFO (MainThread) [supervisor.core] Supervisor is up and running\u001b[0m\n\u001b[32m2025-05-28 17:00:54.934 INFO (MainThread) [supervisor.resolution.checks.base] Run check for pwned/addon\u001b[0m\n\u001b[32m2025-05-28 17:00:54.955 INFO (MainThread) [supervisor.resolution.checks.base] Run check for free_space/system\u001b[0m\n\u001b[32m2025-05-28 17:00:55.003 INFO (MainThread) [supervisor.resolution.checks.base] Run check for no_current_backup/system\u001b[0m\n\u001b[32m2025-05-28 17:00:55.007 INFO (MainThread) [supervisor.resolution.module] Create new suggestion create_full_backup - system / None\u001b[0m\n\u001b[32m2025-05-28 17:00:55.009 INFO (MainThread) [supervisor.resolution.module] Create new issue no_current_backup - system / None\u001b[0m\n\u001b[32m2025-05-28 17:00:55.011 INFO (MainThread) [supervisor.resolution.checks.base] Run check for trust/supervisor\u001b[0m\n\u001b[32m2025-05-28 17:00:55.385 INFO (MainThread) [supervisor.updater] Fetching update data from https://version.home-assistant.io/stable.json\u001b[0m\n\u001b[32m2025-05-28 17:00:56.162 INFO (MainThread) [supervisor.resolution.checks.base] Run check for multiple_data_disks/system\u001b[0m\n\u001b[32m2025-05-28 17:00:56.163 INFO (MainThread) [supervisor.resolution.checks.base] Run check for dns_server_ipv6_error/dns_server\u001b[0m\n\u001b[32m2025-05-28 17:00:56.210 INFO (MainThread) [supervisor.resolution.checks.base] Run check for docker_config/system\u001b[0m\n\u001b[32m2025-05-28 17:00:56.212 INFO (MainThread) [supervisor.resolution.checks.base] Run check for ipv4_connection_problem/system\u001b[0m\n\u001b[32m2025-05-28 17:00:56.214 INFO (MainThread) [supervisor.resolution.checks.base] Run check for security/core\u001b[0m\n\u001b[32m2025-05-28 17:00:56.220 INFO (MainThread) [supervisor.resolution.check] System checks complete\u001b[0m\n\u001b[32m2025-05-28 17:00:56.221 INFO (MainThread) [supervisor.resolution.evaluate] Starting system evaluation with state running\u001b[0m\n\u001b[32m2025-05-28 17:01:01.995 INFO (MainThread) [supervisor.jobs] 'OSManager.reload' blocked from execution, no Home Assistant OS available\u001b[0m\n\u001b[32m2025-05-28 17:01:01.997 INFO (MainThread) [supervisor.host.services] Updating service information\u001b[0m\n\u001b[32m2025-05-28 17:01:01.036 INFO (MainThread) [supervisor.host.network] Updating local network information\u001b[0m\n\u001b[32m2025-05-28 17:01:03.038 INFO (MainThread) [supervisor.host.sound] Updating PulseAudio information\u001b[0m\n\u001b[32m2025-05-28 17:01:03.971 INFO (MainThread) [supervisor.host.manager] Host information reload completed\u001b[0m\n\u001b[32m2025-05-28 17:01:06.579 INFO (MainThread) [supervisor.resolution.evaluate] System evaluation complete\u001b[0m\n\u001b[32m2025-05-28 17:01:06.581 INFO (MainThread) [supervisor.resolution.fixup] Starting system autofix at state running\u001b[0m\n\u001b[32m2025-05-28 17:01:06.583 INFO (MainThread) [supervisor.resolution.fixup] System autofix complete\u001b[0m"},"resolved_issues":{"kind":"list like","value":[{"body":"### The problem\n\nA repair is not generated for a supervised system.\n\n## System Information\n\nversion | core-2025.6.0b0\n-- | --\ninstallation_type | Home Assistant Supervised\ndev | false\nhassio | true\ndocker | true\nuser | root\nvirtualenv | false\npython_version | 3.13.3\nos_name | Linux\nos_version | 6.1.0-26-amd64\narch | x86_64\ntimezone | America/New_York\nconfig_dir | /config\n\n<details><summary>Home Assistant Community Store</summary>\n\nGitHub API | ok\n-- | --\nGitHub Content | ok\nGitHub Web | ok\nHACS Data | ok\nGitHub API Calls Remaining | 4993\nInstalled Version | 2.0.5\nStage | running\nAvailable Repositories | 1880\nDownloaded Repositories | 28\n\n</details>\n\n<details><summary>AccuWeather</summary>\n\ncan_reach_server | ok\n-- | --\nremaining_requests | 12\n\n</details>\n\n<details><summary>Home Assistant Cloud</summary>\n\nlogged_in | true\n-- | --\nsubscription_expiration | August 24, 2025 at 8:00 PM\nrelayer_connected | true\nrelayer_region | us-east-1\nremote_enabled | true\nremote_connected | true\nalexa_enabled | true\ngoogle_enabled | false\ncloud_ice_servers_enabled | false\nremote_server | us-east-1-9.ui.nabu.casa\ncertificate_status | ready\ninstance_id | cb8f11775bbe42878839a021bdcf890e\ncan_reach_cert_server | ok\ncan_reach_cloud_auth | ok\ncan_reach_cloud | ok\n\n</details>\n\n<details><summary>Home Assistant Supervisor</summary>\n\nhost_os | Debian GNU/Linux 12 (bookworm)\n-- | --\nupdate_channel | beta\nsupervisor_version | supervisor-2025.05.3\nagent_version | 1.2.0\ndocker_version | 27.3.1\ndisk_total | 219.9 GB\ndisk_used | 31.3 GB\nhealthy | true\nsupported | true\nhost_connectivity | true\nsupervisor_connectivity | true\nntp_synchronized | true\nvirtualization | \nsupervisor_api | ok\nversion_api | ok\ninstalled_addons | Samba share (12.5.1), Terminal & SSH (9.17.0), ESPHome Device Builder (2025.5.1), Z-Wave JS UI (4.3.1), Network UPS Tools (0.14.1), Samba Backup (5.2.0), AdGuard Home (5.2.9), Zigbee2MQTT (2.3.0-1), MariaDB (2.7.2), phpMyAdmin (0.11.1), Studio Code Server (5.19.3), Get HACS (1.3.1), ecowitt2mqtt (2024.10.0), Mosquitto broker (6.5.1)\n\n</details>\n\n<details><summary>Dashboards</summary>\n\ndashboards | 7\n-- | --\nresources | 11\nviews | 65\nmode | yaml\n\n</details>\n\n<details><summary>Network Configuration</summary>\n\nadapters | lo (disabled), eno1 (enabled, default, auto), docker0 (disabled), hassio (disabled), vethd12978d (disabled), vethc5092f2 (disabled), veth0632d56 (disabled), veth0501aaa (disabled), vetha533135 (disabled), veth83f9ca0 (disabled), veth6e6bcc0 (disabled), vethd8dcd71 (disabled), vethd4b4998 (disabled), veth4863af8 (disabled), vethee2c460 (disabled), veth1681e81 (disabled), vethc23cdf0 (disabled), veth791ed81 (disabled)\n-- | --\nipv4_addresses | lo (127.0.0.1/8), eno1 (192.168.1.134/24), docker0 (172.17.0.1/16), hassio (172.30.32.1/23), vethd12978d (), vethc5092f2 (), veth0632d56 (), veth0501aaa (), vetha533135 (), veth83f9ca0 (), veth6e6bcc0 (), vethd8dcd71 (), vethd4b4998 (), veth4863af8 (), vethee2c460 (), veth1681e81 (), vethc23cdf0 (), veth791ed81 ()\nipv6_addresses | lo (::1/128), eno1 (fe80::ea2d:c701:b86:361d/64), docker0 (fe80::42:3cff:fe10:17a8/64), hassio (fe80::42:dff:fea7:d90d/64), vethd12978d (fe80::e45e:75ff:fe8f:8df9/64), vethc5092f2 (fe80::78dc:e4ff:fec5:1926/64), veth0632d56 (fe80::c859:a4ff:fed8:c9b6/64), veth0501aaa (fe80::40ce:37ff:fef1:6d78/64), vetha533135 (fe80::b4d5:17ff:fe17:4479/64), veth83f9ca0 (fe80::a881:cfff:fe8e:5773/64), veth6e6bcc0 (fe80::1440:f8ff:fe7d:65e5/64), vethd8dcd71 (fe80::c88d:b1ff:fed1:da65/64), vethd4b4998 (fe80::f0e9:23ff:fe81:f7f7/64), veth4863af8 (fe80::d8e1:6ff:feea:186a/64), vethee2c460 (fe80::4878:eeff:fe08:bd47/64), veth1681e81 (fe80::86:4ff:fe06:6adb/64), vethc23cdf0 (fe80::a09d:6bff:fe7e:f95e/64), veth791ed81 (fe80::7074:15ff:fe70:7d0b/64)\nannounce_addresses | 192.168.1.134, fe80::ea2d:c701:b86:361d\n\n</details>\n\n<details><summary>Recorder</summary>\n\noldest_recorder_run | March 27, 2025 at 8:51 PM\n-- | --\ncurrent_recorder_run | May 27, 2025 at 7:10 AM\nestimated_db_size | 2173.64 MiB\ndatabase_engine | mysql\ndatabase_version | 10.11.6\n\n</details>\n\n<details><summary>Spotify</summary>\n\napi_endpoint_reachable | ok\n-- | --\n\n</details>\n\n### What version of Home Assistant Core has the issue?\n\ncore-2025.6.0b0\n\n### What was the last working version of Home Assistant Core?\n\nNA\n\n### What type of installation are you running?\n\nHome Assistant Supervised\n\n### Integration causing the issue\n\n_No response_\n\n### Link to integration documentation on our website\n\n_No response_\n\n### Diagnostics information\n\n_No response_\n\n### Example YAML snippet\n\n```yaml\n\n```\n\n### Anything in the logs that might be useful for us?\n\n```txt\n\n```\n\n### Additional information\n\n_No response_","number":145730,"title":"No repair for supervisor deprecation"}],"string":"[\n {\n \"body\": \"### The problem\\n\\nA repair is not generated for a supervised system.\\n\\n## System Information\\n\\nversion | core-2025.6.0b0\\n-- | --\\ninstallation_type | Home Assistant Supervised\\ndev | false\\nhassio | true\\ndocker | true\\nuser | root\\nvirtualenv | false\\npython_version | 3.13.3\\nos_name | Linux\\nos_version | 6.1.0-26-amd64\\narch | x86_64\\ntimezone | America/New_York\\nconfig_dir | /config\\n\\n<details><summary>Home Assistant Community Store</summary>\\n\\nGitHub API | ok\\n-- | --\\nGitHub Content | ok\\nGitHub Web | ok\\nHACS Data | ok\\nGitHub API Calls Remaining | 4993\\nInstalled Version | 2.0.5\\nStage | running\\nAvailable Repositories | 1880\\nDownloaded Repositories | 28\\n\\n</details>\\n\\n<details><summary>AccuWeather</summary>\\n\\ncan_reach_server | ok\\n-- | --\\nremaining_requests | 12\\n\\n</details>\\n\\n<details><summary>Home Assistant Cloud</summary>\\n\\nlogged_in | true\\n-- | --\\nsubscription_expiration | August 24, 2025 at 8:00 PM\\nrelayer_connected | true\\nrelayer_region | us-east-1\\nremote_enabled | true\\nremote_connected | true\\nalexa_enabled | true\\ngoogle_enabled | false\\ncloud_ice_servers_enabled | false\\nremote_server | us-east-1-9.ui.nabu.casa\\ncertificate_status | ready\\ninstance_id | cb8f11775bbe42878839a021bdcf890e\\ncan_reach_cert_server | ok\\ncan_reach_cloud_auth | ok\\ncan_reach_cloud | ok\\n\\n</details>\\n\\n<details><summary>Home Assistant Supervisor</summary>\\n\\nhost_os | Debian GNU/Linux 12 (bookworm)\\n-- | --\\nupdate_channel | beta\\nsupervisor_version | supervisor-2025.05.3\\nagent_version | 1.2.0\\ndocker_version | 27.3.1\\ndisk_total | 219.9 GB\\ndisk_used | 31.3 GB\\nhealthy | true\\nsupported | true\\nhost_connectivity | true\\nsupervisor_connectivity | true\\nntp_synchronized | true\\nvirtualization | \\nsupervisor_api | ok\\nversion_api | ok\\ninstalled_addons | Samba share (12.5.1), Terminal & SSH (9.17.0), ESPHome Device Builder (2025.5.1), Z-Wave JS UI (4.3.1), Network UPS Tools (0.14.1), Samba Backup (5.2.0), AdGuard Home (5.2.9), Zigbee2MQTT (2.3.0-1), MariaDB (2.7.2), phpMyAdmin (0.11.1), Studio Code Server (5.19.3), Get HACS (1.3.1), ecowitt2mqtt (2024.10.0), Mosquitto broker (6.5.1)\\n\\n</details>\\n\\n<details><summary>Dashboards</summary>\\n\\ndashboards | 7\\n-- | --\\nresources | 11\\nviews | 65\\nmode | yaml\\n\\n</details>\\n\\n<details><summary>Network Configuration</summary>\\n\\nadapters | lo (disabled), eno1 (enabled, default, auto), docker0 (disabled), hassio (disabled), vethd12978d (disabled), vethc5092f2 (disabled), veth0632d56 (disabled), veth0501aaa (disabled), vetha533135 (disabled), veth83f9ca0 (disabled), veth6e6bcc0 (disabled), vethd8dcd71 (disabled), vethd4b4998 (disabled), veth4863af8 (disabled), vethee2c460 (disabled), veth1681e81 (disabled), vethc23cdf0 (disabled), veth791ed81 (disabled)\\n-- | --\\nipv4_addresses | lo (127.0.0.1/8), eno1 (192.168.1.134/24), docker0 (172.17.0.1/16), hassio (172.30.32.1/23), vethd12978d (), vethc5092f2 (), veth0632d56 (), veth0501aaa (), vetha533135 (), veth83f9ca0 (), veth6e6bcc0 (), vethd8dcd71 (), vethd4b4998 (), veth4863af8 (), vethee2c460 (), veth1681e81 (), vethc23cdf0 (), veth791ed81 ()\\nipv6_addresses | lo (::1/128), eno1 (fe80::ea2d:c701:b86:361d/64), docker0 (fe80::42:3cff:fe10:17a8/64), hassio (fe80::42:dff:fea7:d90d/64), vethd12978d (fe80::e45e:75ff:fe8f:8df9/64), vethc5092f2 (fe80::78dc:e4ff:fec5:1926/64), veth0632d56 (fe80::c859:a4ff:fed8:c9b6/64), veth0501aaa (fe80::40ce:37ff:fef1:6d78/64), vetha533135 (fe80::b4d5:17ff:fe17:4479/64), veth83f9ca0 (fe80::a881:cfff:fe8e:5773/64), veth6e6bcc0 (fe80::1440:f8ff:fe7d:65e5/64), vethd8dcd71 (fe80::c88d:b1ff:fed1:da65/64), vethd4b4998 (fe80::f0e9:23ff:fe81:f7f7/64), veth4863af8 (fe80::d8e1:6ff:feea:186a/64), vethee2c460 (fe80::4878:eeff:fe08:bd47/64), veth1681e81 (fe80::86:4ff:fe06:6adb/64), vethc23cdf0 (fe80::a09d:6bff:fe7e:f95e/64), veth791ed81 (fe80::7074:15ff:fe70:7d0b/64)\\nannounce_addresses | 192.168.1.134, fe80::ea2d:c701:b86:361d\\n\\n</details>\\n\\n<details><summary>Recorder</summary>\\n\\noldest_recorder_run | March 27, 2025 at 8:51 PM\\n-- | --\\ncurrent_recorder_run | May 27, 2025 at 7:10 AM\\nestimated_db_size | 2173.64 MiB\\ndatabase_engine | mysql\\ndatabase_version | 10.11.6\\n\\n</details>\\n\\n<details><summary>Spotify</summary>\\n\\napi_endpoint_reachable | ok\\n-- | --\\n\\n</details>\\n\\n### What version of Home Assistant Core has the issue?\\n\\ncore-2025.6.0b0\\n\\n### What was the last working version of Home Assistant Core?\\n\\nNA\\n\\n### What type of installation are you running?\\n\\nHome Assistant Supervised\\n\\n### Integration causing the issue\\n\\n_No response_\\n\\n### Link to integration documentation on our website\\n\\n_No response_\\n\\n### Diagnostics information\\n\\n_No response_\\n\\n### Example YAML snippet\\n\\n```yaml\\n\\n```\\n\\n### Anything in the logs that might be useful for us?\\n\\n```txt\\n\\n```\\n\\n### Additional information\\n\\n_No response_\",\n \"number\": 145730,\n \"title\": \"No repair for supervisor deprecation\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"d015dff855995760a2695584bac6637dab17b410"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"71eab0c5901862f659ae3f92be43b6458fec6500\",\n \"head_commit_message\": \"Split deprecated system issue in 2 places\",\n \"patch_to_review\": \"diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py\\nindex eeeedff00bbd29..ae07aa48a52e3b 100644\\n--- a/homeassistant/components/hassio/__init__.py\\n+++ b/homeassistant/components/hassio/__init__.py\\n@@ -37,6 +37,7 @@\\n config_validation as cv,\\n device_registry as dr,\\n discovery_flow,\\n+ issue_registry as ir,\\n )\\n from homeassistant.helpers.aiohttp_client import async_get_clientsession\\n from homeassistant.helpers.deprecation import (\\n@@ -51,9 +52,11 @@\\n get_supervisor_ip as _get_supervisor_ip,\\n is_hassio as _is_hassio,\\n )\\n+from homeassistant.helpers.issue_registry import IssueSeverity\\n from homeassistant.helpers.service_info.hassio import (\\n HassioServiceInfo as _HassioServiceInfo,\\n )\\n+from homeassistant.helpers.system_info import async_get_system_info\\n from homeassistant.helpers.typing import ConfigType\\n from homeassistant.loader import bind_hass\\n from homeassistant.util.async_ import create_eager_task\\n@@ -109,7 +112,7 @@\\n get_core_info, # noqa: F401\\n get_core_stats, # noqa: F401\\n get_host_info, # noqa: F401\\n- get_info, # noqa: F401\\n+ get_info,\\n get_issues_info, # noqa: F401\\n get_os_info,\\n get_supervisor_info, # noqa: F401\\n@@ -168,6 +171,11 @@\\n \\n VALID_ADDON_SLUG = vol.Match(re.compile(r\\\"^[-_.A-Za-z0-9]+$\\\"))\\n \\n+DEPRECATION_URL = (\\n+ \\\"https://www.home-assistant.io/blog/2025/05/22/\\\"\\n+ \\\"deprecating-core-and-supervised-installation-methods-and-32-bit-systems/\\\"\\n+)\\n+\\n \\n def valid_addon(value: Any) -> str:\\n \\\"\\\"\\\"Validate value is a valid addon slug.\\\"\\\"\\\"\\n@@ -546,6 +554,63 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:\\n await coordinator.async_config_entry_first_refresh()\\n hass.data[ADDONS_COORDINATOR] = coordinator\\n \\n+ system_info = await async_get_system_info(hass)\\n+\\n+ def deprecated_setup_issue() -> None:\\n+ os_info = get_os_info(hass)\\n+ info = get_info(hass)\\n+ if os_info is None or info is None:\\n+ return\\n+ is_haos = info.get(\\\"hassos\\\") is not None\\n+ arch = system_info[\\\"arch\\\"]\\n+ board = os_info.get(\\\"board\\\")\\n+ supported_board = board in {\\\"rpi3\\\", \\\"rpi4\\\", \\\"tinker\\\", \\\"odroid-xu4\\\", \\\"rpi2\\\"}\\n+ if is_haos and arch == \\\"armv7\\\" and supported_board:\\n+ issue_id = \\\"deprecated_os_\\\"\\n+ if board in {\\\"rpi3\\\", \\\"rpi4\\\"}:\\n+ issue_id += \\\"aarch64\\\"\\n+ elif board in {\\\"tinker\\\", \\\"odroid-xu4\\\", \\\"rpi2\\\"}:\\n+ issue_id += \\\"armv7\\\"\\n+ ir.async_create_issue(\\n+ hass,\\n+ \\\"homeassistant\\\",\\n+ issue_id,\\n+ breaks_in_ha_version=\\\"2025.12.0\\\",\\n+ learn_more_url=DEPRECATION_URL,\\n+ is_fixable=False,\\n+ severity=IssueSeverity.WARNING,\\n+ translation_key=issue_id,\\n+ translation_placeholders={\\n+ \\\"installation_guide\\\": \\\"https://www.home-assistant.io/installation/\\\",\\n+ },\\n+ )\\n+ deprecated_architecture = False\\n+ if arch in {\\\"i386\\\", \\\"armhf\\\"} or (arch == \\\"armv7\\\" and not supported_board):\\n+ deprecated_architecture = True\\n+ if not is_haos or deprecated_architecture:\\n+ issue_id = \\\"deprecated\\\"\\n+ if not is_haos:\\n+ issue_id += \\\"_method\\\"\\n+ if deprecated_architecture:\\n+ issue_id += \\\"_architecture\\\"\\n+ ir.async_create_issue(\\n+ hass,\\n+ \\\"homeassistant\\\",\\n+ issue_id,\\n+ breaks_in_ha_version=\\\"2025.12.0\\\",\\n+ learn_more_url=DEPRECATION_URL,\\n+ is_fixable=False,\\n+ severity=IssueSeverity.WARNING,\\n+ translation_key=issue_id,\\n+ translation_placeholders={\\n+ \\\"installation_type\\\": \\\"Supervised\\\",\\n+ \\\"arch\\\": arch,\\n+ },\\n+ )\\n+ listener()\\n+\\n+ listener = coordinator.async_add_listener(deprecated_setup_issue)\\n+\\n await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)\\n \\n return True\\ndiff --git a/homeassistant/components/homeassistant/__init__.py b/homeassistant/components/homeassistant/__init__.py\\nindex 5f012c6a054b92..1433358b56833f 100644\\n--- a/homeassistant/components/homeassistant/__init__.py\\n+++ b/homeassistant/components/homeassistant/__init__.py\\n@@ -4,7 +4,7 @@\\n from collections.abc import Callable, Coroutine\\n import itertools as it\\n import logging\\n-from typing import TYPE_CHECKING, Any\\n+from typing import Any\\n \\n import voluptuous as vol\\n \\n@@ -38,7 +38,6 @@\\n restore_state,\\n )\\n from homeassistant.helpers.entity_component import async_update_entity\\n-from homeassistant.helpers.importlib import async_import_module\\n from homeassistant.helpers.issue_registry import IssueSeverity\\n from homeassistant.helpers.service import (\\n async_extract_config_entry_ids,\\n@@ -402,79 +401,45 @@ async def async_handle_reload_all(call: ServiceCall) -> None:\\n info = await async_get_system_info(hass)\\n \\n installation_type = info[\\\"installation_type\\\"][15:]\\n- deprecated_method = installation_type in {\\n- \\\"Core\\\",\\n- \\\"Supervised\\\",\\n- }\\n- arch = info[\\\"arch\\\"]\\n- if arch == \\\"armv7\\\":\\n- if installation_type == \\\"OS\\\":\\n- # Local import to avoid circular dependencies\\n- # We use the import helper because hassio\\n- # may not be loaded yet and we don't want to\\n- # do blocking I/O in the event loop to import it.\\n- if TYPE_CHECKING:\\n- # pylint: disable-next=import-outside-toplevel\\n- from homeassistant.components import hassio\\n- else:\\n- hassio = await async_import_module(\\n- hass, \\\"homeassistant.components.hassio\\\"\\n- )\\n- os_info = hassio.get_os_info(hass)\\n- assert os_info is not None\\n- issue_id = \\\"deprecated_os_\\\"\\n- board = os_info.get(\\\"board\\\")\\n- if board in {\\\"rpi3\\\", \\\"rpi4\\\"}:\\n- issue_id += \\\"aarch64\\\"\\n- elif board in {\\\"tinker\\\", \\\"odroid-xu4\\\", \\\"rpi2\\\"}:\\n- issue_id += \\\"armv7\\\"\\n+ if installation_type in {\\\"Core\\\", \\\"Container\\\"}:\\n+ deprecated_method = installation_type == \\\"Core\\\"\\n+ arch = info[\\\"arch\\\"]\\n+ if arch == \\\"armv7\\\" and installation_type == \\\"Container\\\":\\n ir.async_create_issue(\\n hass,\\n DOMAIN,\\n- issue_id,\\n+ \\\"deprecated_container_armv7\\\",\\n breaks_in_ha_version=\\\"2025.12.0\\\",\\n learn_more_url=DEPRECATION_URL,\\n is_fixable=False,\\n severity=IssueSeverity.WARNING,\\n- translation_key=issue_id,\\n- translation_placeholders={\\n- \\\"installation_guide\\\": \\\"https://www.home-assistant.io/installation/\\\",\\n- },\\n+ translation_key=\\\"deprecated_container_armv7\\\",\\n )\\n- elif installation_type == \\\"Container\\\":\\n+ deprecated_architecture = False\\n+ if arch in {\\\"i386\\\", \\\"armhf\\\"} or (\\n+ arch == \\\"armv7\\\" and installation_type != \\\"Container\\\"\\n+ ):\\n+ deprecated_architecture = True\\n+ if deprecated_method or deprecated_architecture:\\n+ issue_id = \\\"deprecated\\\"\\n+ if deprecated_method:\\n+ issue_id += \\\"_method\\\"\\n+ if deprecated_architecture:\\n+ issue_id += \\\"_architecture\\\"\\n ir.async_create_issue(\\n hass,\\n DOMAIN,\\n- \\\"deprecated_container_armv7\\\",\\n+ issue_id,\\n breaks_in_ha_version=\\\"2025.12.0\\\",\\n learn_more_url=DEPRECATION_URL,\\n is_fixable=False,\\n severity=IssueSeverity.WARNING,\\n- translation_key=\\\"deprecated_container_armv7\\\",\\n+ translation_key=issue_id,\\n+ translation_placeholders={\\n+ \\\"installation_type\\\": installation_type,\\n+ \\\"arch\\\": arch,\\n+ },\\n )\\n- deprecated_architecture = False\\n- if arch in {\\\"i386\\\", \\\"armhf\\\"} or (arch == \\\"armv7\\\" and deprecated_method):\\n- deprecated_architecture = True\\n- if deprecated_method or deprecated_architecture:\\n- issue_id = \\\"deprecated\\\"\\n- if deprecated_method:\\n- issue_id += \\\"_method\\\"\\n- if deprecated_architecture:\\n- issue_id += \\\"_architecture\\\"\\n- ir.async_create_issue(\\n- hass,\\n- DOMAIN,\\n- issue_id,\\n- breaks_in_ha_version=\\\"2025.12.0\\\",\\n- learn_more_url=DEPRECATION_URL,\\n- is_fixable=False,\\n- severity=IssueSeverity.WARNING,\\n- translation_key=issue_id,\\n- translation_placeholders={\\n- \\\"installation_type\\\": installation_type,\\n- \\\"arch\\\": arch,\\n- },\\n- )\\n \\n return True\\n \\ndiff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py\\nindex d34aed608fb724..83ec61a53112bf 100644\\n--- a/tests/components/hassio/test_init.py\\n+++ b/tests/components/hassio/test_init.py\\n@@ -8,6 +8,7 @@\\n \\n from aiohasupervisor import SupervisorError\\n from aiohasupervisor.models import AddonsStats\\n+from freezegun.api import FrozenDateTimeFactory\\n import pytest\\n from voluptuous import Invalid\\n \\n@@ -23,10 +24,13 @@\\n is_hassio as deprecated_is_hassio,\\n )\\n from homeassistant.components.hassio.config import STORAGE_KEY\\n-from homeassistant.components.hassio.const import REQUEST_REFRESH_DELAY\\n+from homeassistant.components.hassio.const import (\\n+ HASSIO_UPDATE_INTERVAL,\\n+ REQUEST_REFRESH_DELAY,\\n+)\\n from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN\\n from homeassistant.core import HomeAssistant\\n-from homeassistant.helpers import device_registry as dr\\n+from homeassistant.helpers import device_registry as dr, issue_registry as ir\\n from homeassistant.helpers.hassio import is_hassio\\n from homeassistant.helpers.service_info.hassio import HassioServiceInfo\\n from homeassistant.setup import async_setup_component\\n@@ -1140,3 +1144,63 @@ def test_deprecated_constants(\\n replacement,\\n \\\"2025.11\\\",\\n )\\n+\\n+\\n+@pytest.mark.parametrize(\\n+ (\\\"board\\\", \\\"issue_id\\\"),\\n+ [\\n+ (\\\"rpi3\\\", \\\"deprecated_os_aarch64\\\"),\\n+ (\\\"rpi4\\\", \\\"deprecated_os_aarch64\\\"),\\n+ (\\\"tinker\\\", \\\"deprecated_os_armv7\\\"),\\n+ (\\\"odroid-xu4\\\", \\\"deprecated_os_armv7\\\"),\\n+ (\\\"rpi2\\\", \\\"deprecated_os_armv7\\\"),\\n+ ],\\n+)\\n+async def test_deprecated_installation_issue_aarch64(\\n+ hass: HomeAssistant,\\n+ issue_registry: ir.IssueRegistry,\\n+ freezer: FrozenDateTimeFactory,\\n+ board: str,\\n+ issue_id: str,\\n+) -> None:\\n+ \\\"\\\"\\\"Test deprecated installation issue.\\\"\\\"\\\"\\n+ with (\\n+ patch.dict(os.environ, MOCK_ENVIRON),\\n+ patch(\\n+ \\\"homeassistant.components.hassio.async_get_system_info\\\",\\n+ return_value={\\n+ \\\"installation_type\\\": \\\"Home Assistant OS\\\",\\n+ \\\"arch\\\": \\\"armv7\\\",\\n+ },\\n+ ),\\n+ patch(\\n+ \\\"homeassistant.components.homeassistant.async_get_system_info\\\",\\n+ return_value={\\n+ \\\"installation_type\\\": \\\"Home Assistant OS\\\",\\n+ \\\"arch\\\": \\\"armv7\\\",\\n+ },\\n+ ),\\n+ patch(\\n+ \\\"homeassistant.components.hassio.get_os_info\\\", return_value={\\\"board\\\": board}\\n+ ),\\n+ patch(\\n+ \\\"homeassistant.components.hassio.get_info\\\", return_value={\\\"hassos\\\": True}\\n+ ),\\n+ ):\\n+ assert await async_setup_component(hass, \\\"homeassistant\\\", {})\\n+ assert await async_setup_component(hass, DOMAIN, {})\\n+ await hass.async_block_till_done()\\n+ freezer.tick(HASSIO_UPDATE_INTERVAL)\\n+ async_fire_time_changed(hass)\\n+ await hass.async_block_till_done()\\n+ freezer.tick(HASSIO_UPDATE_INTERVAL)\\n+ async_fire_time_changed(hass)\\n+ await hass.async_block_till_done()\\n+\\n+ assert len(issue_registry.issues) == 1\\n+ issue = issue_registry.async_get_issue(\\\"homeassistant\\\", issue_id)\\n+ assert issue.domain == \\\"homeassistant\\\"\\n+ assert issue.severity == ir.IssueSeverity.WARNING\\n+ assert issue.translation_placeholders == {\\n+ \\\"installation_guide\\\": \\\"https://www.home-assistant.io/installation/\\\",\\n+ }\\ndiff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py\\nindex 530a729e12d719..a5e454221d317c 100644\\n--- a/tests/components/homeassistant/test_init.py\\n+++ b/tests/components/homeassistant/test_init.py\\n@@ -640,13 +640,6 @@ async def test_reload_all(\\n assert len(jinja) == 1\\n \\n \\n-@pytest.mark.parametrize(\\n- \\\"installation_type\\\",\\n- [\\n- \\\"Home Assistant Core\\\",\\n- \\\"Home Assistant Supervised\\\",\\n- ],\\n-)\\n @pytest.mark.parametrize(\\n \\\"arch\\\",\\n [\\n@@ -658,14 +651,13 @@ async def test_reload_all(\\n async def test_deprecated_installation_issue_32bit_method(\\n hass: HomeAssistant,\\n issue_registry: ir.IssueRegistry,\\n- installation_type: str,\\n arch: str,\\n ) -> None:\\n \\\"\\\"\\\"Test deprecated installation issue.\\\"\\\"\\\"\\n with patch(\\n \\\"homeassistant.components.homeassistant.async_get_system_info\\\",\\n return_value={\\n- \\\"installation_type\\\": installation_type,\\n+ \\\"installation_type\\\": \\\"Home Assistant Core\\\",\\n \\\"arch\\\": arch,\\n },\\n ):\\n@@ -677,18 +669,11 @@ async def test_deprecated_installation_issue_32bit_method(\\n assert issue.domain == DOMAIN\\n assert issue.severity == ir.IssueSeverity.WARNING\\n assert issue.translation_placeholders == {\\n- \\\"installation_type\\\": installation_type[15:],\\n+ \\\"installation_type\\\": \\\"Core\\\",\\n \\\"arch\\\": arch,\\n }\\n \\n \\n-@pytest.mark.parametrize(\\n- \\\"installation_type\\\",\\n- [\\n- \\\"Home Assistant Container\\\",\\n- \\\"Home Assistant OS\\\",\\n- ],\\n-)\\n @pytest.mark.parametrize(\\n \\\"arch\\\",\\n [\\n@@ -699,14 +684,13 @@ async def test_deprecated_installation_issue_32bit_method(\\n async def test_deprecated_installation_issue_32bit(\\n hass: HomeAssistant,\\n issue_registry: ir.IssueRegistry,\\n- installation_type: str,\\n arch: str,\\n ) -> None:\\n \\\"\\\"\\\"Test deprecated installation issue.\\\"\\\"\\\"\\n with patch(\\n \\\"homeassistant.components.homeassistant.async_get_system_info\\\",\\n return_value={\\n- \\\"installation_type\\\": installation_type,\\n+ \\\"installation_type\\\": \\\"Home Assistant Container\\\",\\n \\\"arch\\\": arch,\\n },\\n ):\\n@@ -718,28 +702,19 @@ async def test_deprecated_installation_issue_32bit(\\n assert issue.domain == DOMAIN\\n assert issue.severity == ir.IssueSeverity.WARNING\\n assert issue.translation_placeholders == {\\n- \\\"installation_type\\\": installation_type[15:],\\n+ \\\"installation_type\\\": \\\"Container\\\",\\n \\\"arch\\\": arch,\\n }\\n \\n \\n-@pytest.mark.parametrize(\\n- \\\"installation_type\\\",\\n- [\\n- \\\"Home Assistant Core\\\",\\n- \\\"Home Assistant Supervised\\\",\\n- ],\\n-)\\n async def test_deprecated_installation_issue_method(\\n- hass: HomeAssistant,\\n- issue_registry: ir.IssueRegistry,\\n- installation_type: str,\\n+ hass: HomeAssistant, issue_registry: ir.IssueRegistry\\n ) -> None:\\n \\\"\\\"\\\"Test deprecated installation issue.\\\"\\\"\\\"\\n with patch(\\n \\\"homeassistant.components.homeassistant.async_get_system_info\\\",\\n return_value={\\n- \\\"installation_type\\\": installation_type,\\n+ \\\"installation_type\\\": \\\"Home Assistant Core\\\",\\n \\\"arch\\\": \\\"generic-x86-64\\\",\\n },\\n ):\\n@@ -751,52 +726,11 @@ async def test_deprecated_installation_issue_method(\\n assert issue.domain == DOMAIN\\n assert issue.severity == ir.IssueSeverity.WARNING\\n assert issue.translation_placeholders == {\\n- \\\"installation_type\\\": installation_type[15:],\\n+ \\\"installation_type\\\": \\\"Core\\\",\\n \\\"arch\\\": \\\"generic-x86-64\\\",\\n }\\n \\n \\n-@pytest.mark.parametrize(\\n- (\\\"board\\\", \\\"issue_id\\\"),\\n- [\\n- (\\\"rpi3\\\", \\\"deprecated_os_aarch64\\\"),\\n- (\\\"rpi4\\\", \\\"deprecated_os_aarch64\\\"),\\n- (\\\"tinker\\\", \\\"deprecated_os_armv7\\\"),\\n- (\\\"odroid-xu4\\\", \\\"deprecated_os_armv7\\\"),\\n- (\\\"rpi2\\\", \\\"deprecated_os_armv7\\\"),\\n- ],\\n-)\\n-async def test_deprecated_installation_issue_aarch64(\\n- hass: HomeAssistant,\\n- issue_registry: ir.IssueRegistry,\\n- board: str,\\n- issue_id: str,\\n-) -> None:\\n- \\\"\\\"\\\"Test deprecated installation issue.\\\"\\\"\\\"\\n- with (\\n- patch(\\n- \\\"homeassistant.components.homeassistant.async_get_system_info\\\",\\n- return_value={\\n- \\\"installation_type\\\": \\\"Home Assistant OS\\\",\\n- \\\"arch\\\": \\\"armv7\\\",\\n- },\\n- ),\\n- patch(\\n- \\\"homeassistant.components.hassio.get_os_info\\\", return_value={\\\"board\\\": board}\\n- ),\\n- ):\\n- assert await async_setup_component(hass, DOMAIN, {})\\n- await hass.async_block_till_done()\\n-\\n- assert len(issue_registry.issues) == 1\\n- issue = issue_registry.async_get_issue(DOMAIN, issue_id)\\n- assert issue.domain == DOMAIN\\n- assert issue.severity == ir.IssueSeverity.WARNING\\n- assert issue.translation_placeholders == {\\n- \\\"installation_guide\\\": \\\"https://www.home-assistant.io/installation/\\\",\\n- }\\n-\\n-\\n async def test_deprecated_installation_issue_armv7_container(\\n hass: HomeAssistant,\\n issue_registry: ir.IssueRegistry,\\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -546,6 +554,63 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:\n await coordinator.async_config_entry_first_refresh()\n hass.data[ADDONS_COORDINATOR] = coordinator\n \n+ system_info = await async_get_system_info(hass)\n+\n+ def deprecated_setup_issue() -> None:\n+ os_info = get_os_info(hass)\n+ info = get_info(hass)\n+ if os_info is None or info is None:\n+ return\n+ is_haos = info.get(\"hassos\") is not None\n+ arch = system_info[\"arch\"]\n+ board = os_info.get(\"board\")\n+ supported_board = board in {\"rpi3\", \"rpi4\", \"tinker\", \"odroid-xu4\", \"rpi2\"}\n+ if is_haos and arch == \"armv7\" and supported_board:\n+ issue_id = \"deprecated_os_\"\n+ if board in {\"rpi3\", \"rpi4\"}:\n+ issue_id += \"aarch64\"\n+ elif board in {\"tinker\", \"odroid-xu4\", \"rpi2\"}:\n+ issue_id += \"armv7\"\n+ ir.async_create_issue(\n+ hass,\n+ \"homeassistant\",\n+ issue_id,\n+ breaks_in_ha_version=\"2025.12.0\",\n+ learn_more_url=DEPRECATION_URL,\n+ is_fixable=False,\n+ severity=IssueSeverity.WARNING,\n+ translation_key=issue_id,\n+ translation_placeholders={\n+ \"installation_guide\": \"https://www.home-assistant.io/installation/\",\n+ },\n+ )\n+ deprecated_architecture = False\n+ if arch in {\"i386\", \"armhf\"} or (arch == \"armv7\" and not supported_board):\n+ deprecated_architecture = True\n+ if not is_haos or deprecated_architecture:\n+ issue_id = \"deprecated\"\n+ if not is_haos:\n+ issue_id += \"_method\"\n+ if deprecated_architecture:\n+ issue_id += \"_architecture\"\n+ ir.async_create_issue(\n+ hass,\n+ \"homeassistant\",\n+ issue_id,\n+ breaks_in_ha_version=\"2025.12.0\",\n+ learn_more_url=DEPRECATION_URL,\n+ is_fixable=False,\n+ severity=IssueSeverity.WARNING,\n+ translation_key=issue_id,\n+ translation_placeholders={\n+ \"installation_type\": \"Supervised\",","line":null,"original_line":606,"original_start_line":null,"path":"homeassistant/components/hassio/__init__.py","start_line":null,"text":"@user1:\nInstallation type isn't always Supervised here, right?\n\n@author:\nIt is, because we check beforehand if we use HAOS or supervised using the same check the system health has, and the upper if statement checks if this is not HAOS, thus it's supervised\n\n@user1:\nWhich upper check?\n\n@author:\nsystem_info.py\r\n```py\r\n if info.get(\"hassos\") is not None:\r\n info_object[\"installation_type\"] = \"Home Assistant OS\"\r\n else:\r\n info_object[\"installation_type\"] = \"Home Assistant Supervised\"\r\n```\r\n\r\nThis file\r\n```py\r\nis_haos = info.get(\"hassos\") is not None\r\n```\r\n```py\r\nif not is_haos or deprecated_architecture:\r\n ir.async_create_issue(\r\n hass,\r\n \"homeassistant\",\r\n issue_id,\r\n breaks_in_ha_version=\"2025.12.0\",\r\n learn_more_url=DEPRECATION_URL,\r\n is_fixable=False,\r\n severity=IssueSeverity.WARNING,\r\n translation_key=issue_id,\r\n translation_placeholders={\r\n \"installation_type\": \"Supervised\",\r\n```\n\n@user1:\nThere's an `or` operator after `is_haos` in the check in your last reference.\n\n@author:\nsharp...."}],"string":"[\n {\n \"diff_hunk\": \"@@ -546,6 +554,63 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:\\n await coordinator.async_config_entry_first_refresh()\\n hass.data[ADDONS_COORDINATOR] = coordinator\\n \\n+ system_info = await async_get_system_info(hass)\\n+\\n+ def deprecated_setup_issue() -> None:\\n+ os_info = get_os_info(hass)\\n+ info = get_info(hass)\\n+ if os_info is None or info is None:\\n+ return\\n+ is_haos = info.get(\\\"hassos\\\") is not None\\n+ arch = system_info[\\\"arch\\\"]\\n+ board = os_info.get(\\\"board\\\")\\n+ supported_board = board in {\\\"rpi3\\\", \\\"rpi4\\\", \\\"tinker\\\", \\\"odroid-xu4\\\", \\\"rpi2\\\"}\\n+ if is_haos and arch == \\\"armv7\\\" and supported_board:\\n+ issue_id = \\\"deprecated_os_\\\"\\n+ if board in {\\\"rpi3\\\", \\\"rpi4\\\"}:\\n+ issue_id += \\\"aarch64\\\"\\n+ elif board in {\\\"tinker\\\", \\\"odroid-xu4\\\", \\\"rpi2\\\"}:\\n+ issue_id += \\\"armv7\\\"\\n+ ir.async_create_issue(\\n+ hass,\\n+ \\\"homeassistant\\\",\\n+ issue_id,\\n+ breaks_in_ha_version=\\\"2025.12.0\\\",\\n+ learn_more_url=DEPRECATION_URL,\\n+ is_fixable=False,\\n+ severity=IssueSeverity.WARNING,\\n+ translation_key=issue_id,\\n+ translation_placeholders={\\n+ \\\"installation_guide\\\": \\\"https://www.home-assistant.io/installation/\\\",\\n+ },\\n+ )\\n+ deprecated_architecture = False\\n+ if arch in {\\\"i386\\\", \\\"armhf\\\"} or (arch == \\\"armv7\\\" and not supported_board):\\n+ deprecated_architecture = True\\n+ if not is_haos or deprecated_architecture:\\n+ issue_id = \\\"deprecated\\\"\\n+ if not is_haos:\\n+ issue_id += \\\"_method\\\"\\n+ if deprecated_architecture:\\n+ issue_id += \\\"_architecture\\\"\\n+ ir.async_create_issue(\\n+ hass,\\n+ \\\"homeassistant\\\",\\n+ issue_id,\\n+ breaks_in_ha_version=\\\"2025.12.0\\\",\\n+ learn_more_url=DEPRECATION_URL,\\n+ is_fixable=False,\\n+ severity=IssueSeverity.WARNING,\\n+ translation_key=issue_id,\\n+ translation_placeholders={\\n+ \\\"installation_type\\\": \\\"Supervised\\\",\",\n \"line\": null,\n \"original_line\": 606,\n \"original_start_line\": null,\n \"path\": \"homeassistant/components/hassio/__init__.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nInstallation type isn't always Supervised here, right?\\n\\n@author:\\nIt is, because we check beforehand if we use HAOS or supervised using the same check the system health has, and the upper if statement checks if this is not HAOS, thus it's supervised\\n\\n@user1:\\nWhich upper check?\\n\\n@author:\\nsystem_info.py\\r\\n```py\\r\\n if info.get(\\\"hassos\\\") is not None:\\r\\n info_object[\\\"installation_type\\\"] = \\\"Home Assistant OS\\\"\\r\\n else:\\r\\n info_object[\\\"installation_type\\\"] = \\\"Home Assistant Supervised\\\"\\r\\n```\\r\\n\\r\\nThis file\\r\\n```py\\r\\nis_haos = info.get(\\\"hassos\\\") is not None\\r\\n```\\r\\n```py\\r\\nif not is_haos or deprecated_architecture:\\r\\n ir.async_create_issue(\\r\\n hass,\\r\\n \\\"homeassistant\\\",\\r\\n issue_id,\\r\\n breaks_in_ha_version=\\\"2025.12.0\\\",\\r\\n learn_more_url=DEPRECATION_URL,\\r\\n is_fixable=False,\\r\\n severity=IssueSeverity.WARNING,\\r\\n translation_key=issue_id,\\r\\n translation_placeholders={\\r\\n \\\"installation_type\\\": \\\"Supervised\\\",\\r\\n```\\n\\n@user1:\\nThere's an `or` operator after `is_haos` in the check in your last reference.\\n\\n@author:\\nsharp....\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"ca08d75cec1a09f0c640e6f2f2802f3f7722e75e"},"merged_patch":{"kind":"string","value":"diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py\nindex eeeedff00bbd2..041877e394423 100644\n--- a/homeassistant/components/hassio/__init__.py\n+++ b/homeassistant/components/hassio/__init__.py\n@@ -37,6 +37,7 @@\n config_validation as cv,\n device_registry as dr,\n discovery_flow,\n+ issue_registry as ir,\n )\n from homeassistant.helpers.aiohttp_client import async_get_clientsession\n from homeassistant.helpers.deprecation import (\n@@ -51,9 +52,11 @@\n get_supervisor_ip as _get_supervisor_ip,\n is_hassio as _is_hassio,\n )\n+from homeassistant.helpers.issue_registry import IssueSeverity\n from homeassistant.helpers.service_info.hassio import (\n HassioServiceInfo as _HassioServiceInfo,\n )\n+from homeassistant.helpers.system_info import async_get_system_info\n from homeassistant.helpers.typing import ConfigType\n from homeassistant.loader import bind_hass\n from homeassistant.util.async_ import create_eager_task\n@@ -109,7 +112,7 @@\n get_core_info, # noqa: F401\n get_core_stats, # noqa: F401\n get_host_info, # noqa: F401\n- get_info, # noqa: F401\n+ get_info,\n get_issues_info, # noqa: F401\n get_os_info,\n get_supervisor_info, # noqa: F401\n@@ -168,6 +171,11 @@\n \n VALID_ADDON_SLUG = vol.Match(re.compile(r\"^[-_.A-Za-z0-9]+$\"))\n \n+DEPRECATION_URL = (\n+ \"https://www.home-assistant.io/blog/2025/05/22/\"\n+ \"deprecating-core-and-supervised-installation-methods-and-32-bit-systems/\"\n+)\n+\n \n def valid_addon(value: Any) -> str:\n \"\"\"Validate value is a valid addon slug.\"\"\"\n@@ -546,6 +554,63 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:\n await coordinator.async_config_entry_first_refresh()\n hass.data[ADDONS_COORDINATOR] = coordinator\n \n+ system_info = await async_get_system_info(hass)\n+\n+ def deprecated_setup_issue() -> None:\n+ os_info = get_os_info(hass)\n+ info = get_info(hass)\n+ if os_info is None or info is None:\n+ return\n+ is_haos = info.get(\"hassos\") is not None\n+ arch = system_info[\"arch\"]\n+ board = os_info.get(\"board\")\n+ supported_board = board in {\"rpi3\", \"rpi4\", \"tinker\", \"odroid-xu4\", \"rpi2\"}\n+ if is_haos and arch == \"armv7\" and supported_board:\n+ issue_id = \"deprecated_os_\"\n+ if board in {\"rpi3\", \"rpi4\"}:\n+ issue_id += \"aarch64\"\n+ elif board in {\"tinker\", \"odroid-xu4\", \"rpi2\"}:\n+ issue_id += \"armv7\"\n+ ir.async_create_issue(\n+ hass,\n+ \"homeassistant\",\n+ issue_id,\n+ breaks_in_ha_version=\"2025.12.0\",\n+ learn_more_url=DEPRECATION_URL,\n+ is_fixable=False,\n+ severity=IssueSeverity.WARNING,\n+ translation_key=issue_id,\n+ translation_placeholders={\n+ \"installation_guide\": \"https://www.home-assistant.io/installation/\",\n+ },\n+ )\n+ deprecated_architecture = False\n+ if arch in {\"i386\", \"armhf\"} or (arch == \"armv7\" and not supported_board):\n+ deprecated_architecture = True\n+ if not is_haos or deprecated_architecture:\n+ issue_id = \"deprecated\"\n+ if not is_haos:\n+ issue_id += \"_method\"\n+ if deprecated_architecture:\n+ issue_id += \"_architecture\"\n+ ir.async_create_issue(\n+ hass,\n+ \"homeassistant\",\n+ issue_id,\n+ breaks_in_ha_version=\"2025.12.0\",\n+ learn_more_url=DEPRECATION_URL,\n+ is_fixable=False,\n+ severity=IssueSeverity.WARNING,\n+ translation_key=issue_id,\n+ translation_placeholders={\n+ \"installation_type\": \"OS\" if is_haos else \"Supervised\",\n+ \"arch\": arch,\n+ },\n+ )\n+ listener()\n+\n+ listener = coordinator.async_add_listener(deprecated_setup_issue)\n+\n await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)\n \n return True\ndiff --git a/homeassistant/components/homeassistant/__init__.py b/homeassistant/components/homeassistant/__init__.py\nindex 5f012c6a054b9..1433358b56833 100644\n--- a/homeassistant/components/homeassistant/__init__.py\n+++ b/homeassistant/components/homeassistant/__init__.py\n@@ -4,7 +4,7 @@\n from collections.abc import Callable, Coroutine\n import itertools as it\n import logging\n-from typing import TYPE_CHECKING, Any\n+from typing import Any\n \n import voluptuous as vol\n \n@@ -38,7 +38,6 @@\n restore_state,\n )\n from homeassistant.helpers.entity_component import async_update_entity\n-from homeassistant.helpers.importlib import async_import_module\n from homeassistant.helpers.issue_registry import IssueSeverity\n from homeassistant.helpers.service import (\n async_extract_config_entry_ids,\n@@ -402,79 +401,45 @@ async def async_handle_reload_all(call: ServiceCall) -> None:\n info = await async_get_system_info(hass)\n \n installation_type = info[\"installation_type\"][15:]\n- deprecated_method = installation_type in {\n- \"Core\",\n- \"Supervised\",\n- }\n- arch = info[\"arch\"]\n- if arch == \"armv7\":\n- if installation_type == \"OS\":\n- # Local import to avoid circular dependencies\n- # We use the import helper because hassio\n- # may not be loaded yet and we don't want to\n- # do blocking I/O in the event loop to import it.\n- if TYPE_CHECKING:\n- # pylint: disable-next=import-outside-toplevel\n- from homeassistant.components import hassio\n- else:\n- hassio = await async_import_module(\n- hass, \"homeassistant.components.hassio\"\n- )\n- os_info = hassio.get_os_info(hass)\n- assert os_info is not None\n- issue_id = \"deprecated_os_\"\n- board = os_info.get(\"board\")\n- if board in {\"rpi3\", \"rpi4\"}:\n- issue_id += \"aarch64\"\n- elif board in {\"tinker\", \"odroid-xu4\", \"rpi2\"}:\n- issue_id += \"armv7\"\n+ if installation_type in {\"Core\", \"Container\"}:\n+ deprecated_method = installation_type == \"Core\"\n+ arch = info[\"arch\"]\n+ if arch == \"armv7\" and installation_type == \"Container\":\n ir.async_create_issue(\n hass,\n DOMAIN,\n- issue_id,\n+ \"deprecated_container_armv7\",\n breaks_in_ha_version=\"2025.12.0\",\n learn_more_url=DEPRECATION_URL,\n is_fixable=False,\n severity=IssueSeverity.WARNING,\n- translation_key=issue_id,\n- translation_placeholders={\n- \"installation_guide\": \"https://www.home-assistant.io/installation/\",\n- },\n+ translation_key=\"deprecated_container_armv7\",\n )\n- elif installation_type == \"Container\":\n+ deprecated_architecture = False\n+ if arch in {\"i386\", \"armhf\"} or (\n+ arch == \"armv7\" and installation_type != \"Container\"\n+ ):\n+ deprecated_architecture = True\n+ if deprecated_method or deprecated_architecture:\n+ issue_id = \"deprecated\"\n+ if deprecated_method:\n+ issue_id += \"_method\"\n+ if deprecated_architecture:\n+ issue_id += \"_architecture\"\n ir.async_create_issue(\n hass,\n DOMAIN,\n- \"deprecated_container_armv7\",\n+ issue_id,\n breaks_in_ha_version=\"2025.12.0\",\n learn_more_url=DEPRECATION_URL,\n is_fixable=False,\n severity=IssueSeverity.WARNING,\n- translation_key=\"deprecated_container_armv7\",\n+ translation_key=issue_id,\n+ translation_placeholders={\n+ \"installation_type\": installation_type,\n+ \"arch\": arch,\n+ },\n )\n- deprecated_architecture = False\n- if arch in {\"i386\", \"armhf\"} or (arch == \"armv7\" and deprecated_method):\n- deprecated_architecture = True\n- if deprecated_method or deprecated_architecture:\n- issue_id = \"deprecated\"\n- if deprecated_method:\n- issue_id += \"_method\"\n- if deprecated_architecture:\n- issue_id += \"_architecture\"\n- ir.async_create_issue(\n- hass,\n- DOMAIN,\n- issue_id,\n- breaks_in_ha_version=\"2025.12.0\",\n- learn_more_url=DEPRECATION_URL,\n- is_fixable=False,\n- severity=IssueSeverity.WARNING,\n- translation_key=issue_id,\n- translation_placeholders={\n- \"installation_type\": installation_type,\n- \"arch\": arch,\n- },\n- )\n \n return True\n \ndiff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py\nindex d34aed608fb72..f74ed852a4973 100644\n--- a/tests/components/hassio/test_init.py\n+++ b/tests/components/hassio/test_init.py\n@@ -8,6 +8,7 @@\n \n from aiohasupervisor import SupervisorError\n from aiohasupervisor.models import AddonsStats\n+from freezegun.api import FrozenDateTimeFactory\n import pytest\n from voluptuous import Invalid\n \n@@ -23,10 +24,13 @@\n is_hassio as deprecated_is_hassio,\n )\n from homeassistant.components.hassio.config import STORAGE_KEY\n-from homeassistant.components.hassio.const import REQUEST_REFRESH_DELAY\n+from homeassistant.components.hassio.const import (\n+ HASSIO_UPDATE_INTERVAL,\n+ REQUEST_REFRESH_DELAY,\n+)\n from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN\n from homeassistant.core import HomeAssistant\n-from homeassistant.helpers import device_registry as dr\n+from homeassistant.helpers import device_registry as dr, issue_registry as ir\n from homeassistant.helpers.hassio import is_hassio\n from homeassistant.helpers.service_info.hassio import HassioServiceInfo\n from homeassistant.setup import async_setup_component\n@@ -1140,3 +1144,285 @@ def test_deprecated_constants(\n replacement,\n \"2025.11\",\n )\n+\n+\n+@pytest.mark.parametrize(\n+ (\"board\", \"issue_id\"),\n+ [\n+ (\"rpi3\", \"deprecated_os_aarch64\"),\n+ (\"rpi4\", \"deprecated_os_aarch64\"),\n+ (\"tinker\", \"deprecated_os_armv7\"),\n+ (\"odroid-xu4\", \"deprecated_os_armv7\"),\n+ (\"rpi2\", \"deprecated_os_armv7\"),\n+ ],\n+)\n+async def test_deprecated_installation_issue_aarch64(\n+ hass: HomeAssistant,\n+ issue_registry: ir.IssueRegistry,\n+ freezer: FrozenDateTimeFactory,\n+ board: str,\n+ issue_id: str,\n+) -> None:\n+ \"\"\"Test deprecated installation issue.\"\"\"\n+ with (\n+ patch.dict(os.environ, MOCK_ENVIRON),\n+ patch(\n+ \"homeassistant.components.hassio.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant OS\",\n+ \"arch\": \"armv7\",\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.homeassistant.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant OS\",\n+ \"arch\": \"armv7\",\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_os_info\", return_value={\"board\": board}\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_info\", return_value={\"hassos\": True}\n+ ),\n+ patch(\"homeassistant.components.hardware.async_setup\", return_value=True),\n+ ):\n+ assert await async_setup_component(hass, \"homeassistant\", {})\n+ config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)\n+ config_entry.add_to_hass(hass)\n+ assert await hass.config_entries.async_setup(config_entry.entry_id)\n+ await hass.async_block_till_done()\n+ freezer.tick(REQUEST_REFRESH_DELAY)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+ await hass.services.async_call(\n+ \"homeassistant\",\n+ \"update_entity\",\n+ {\n+ \"entity_id\": [\n+ \"update.home_assistant_core_update\",\n+ \"update.home_assistant_supervisor_update\",\n+ ]\n+ },\n+ blocking=True,\n+ )\n+ freezer.tick(HASSIO_UPDATE_INTERVAL)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+\n+ assert len(issue_registry.issues) == 1\n+ issue = issue_registry.async_get_issue(\"homeassistant\", issue_id)\n+ assert issue.domain == \"homeassistant\"\n+ assert issue.severity == ir.IssueSeverity.WARNING\n+ assert issue.translation_placeholders == {\n+ \"installation_guide\": \"https://www.home-assistant.io/installation/\",\n+ }\n+\n+\n+@pytest.mark.parametrize(\n+ \"arch\",\n+ [\n+ \"i386\",\n+ \"armhf\",\n+ \"armv7\",\n+ ],\n+)\n+async def test_deprecated_installation_issue_32bit_method(\n+ hass: HomeAssistant,\n+ issue_registry: ir.IssueRegistry,\n+ freezer: FrozenDateTimeFactory,\n+ arch: str,\n+) -> None:\n+ \"\"\"Test deprecated architecture issue.\"\"\"\n+ with (\n+ patch.dict(os.environ, MOCK_ENVIRON),\n+ patch(\n+ \"homeassistant.components.hassio.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant OS\",\n+ \"arch\": arch,\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.homeassistant.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant OS\",\n+ \"arch\": arch,\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_os_info\",\n+ return_value={\"board\": \"rpi3-64\"},\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_info\", return_value={\"hassos\": True}\n+ ),\n+ patch(\"homeassistant.components.hardware.async_setup\", return_value=True),\n+ ):\n+ assert await async_setup_component(hass, \"homeassistant\", {})\n+ config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)\n+ config_entry.add_to_hass(hass)\n+ assert await hass.config_entries.async_setup(config_entry.entry_id)\n+ await hass.async_block_till_done()\n+ freezer.tick(REQUEST_REFRESH_DELAY)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+ await hass.services.async_call(\n+ \"homeassistant\",\n+ \"update_entity\",\n+ {\n+ \"entity_id\": [\n+ \"update.home_assistant_core_update\",\n+ \"update.home_assistant_supervisor_update\",\n+ ]\n+ },\n+ blocking=True,\n+ )\n+ freezer.tick(HASSIO_UPDATE_INTERVAL)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+\n+ assert len(issue_registry.issues) == 1\n+ issue = issue_registry.async_get_issue(\"homeassistant\", \"deprecated_architecture\")\n+ assert issue.domain == \"homeassistant\"\n+ assert issue.severity == ir.IssueSeverity.WARNING\n+ assert issue.translation_placeholders == {\"installation_type\": \"OS\", \"arch\": arch}\n+\n+\n+@pytest.mark.parametrize(\n+ \"arch\",\n+ [\n+ \"i386\",\n+ \"armhf\",\n+ \"armv7\",\n+ ],\n+)\n+async def test_deprecated_installation_issue_32bit_supervised(\n+ hass: HomeAssistant,\n+ issue_registry: ir.IssueRegistry,\n+ freezer: FrozenDateTimeFactory,\n+ arch: str,\n+) -> None:\n+ \"\"\"Test deprecated architecture issue.\"\"\"\n+ with (\n+ patch.dict(os.environ, MOCK_ENVIRON),\n+ patch(\n+ \"homeassistant.components.hassio.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant Supervised\",\n+ \"arch\": arch,\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.homeassistant.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant Supervised\",\n+ \"arch\": arch,\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_os_info\",\n+ return_value={\"board\": \"rpi3-64\"},\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_info\", return_value={\"hassos\": None}\n+ ),\n+ patch(\"homeassistant.components.hardware.async_setup\", return_value=True),\n+ ):\n+ assert await async_setup_component(hass, \"homeassistant\", {})\n+ config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)\n+ config_entry.add_to_hass(hass)\n+ assert await hass.config_entries.async_setup(config_entry.entry_id)\n+ await hass.async_block_till_done()\n+ freezer.tick(REQUEST_REFRESH_DELAY)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+ await hass.services.async_call(\n+ \"homeassistant\",\n+ \"update_entity\",\n+ {\n+ \"entity_id\": [\n+ \"update.home_assistant_core_update\",\n+ \"update.home_assistant_supervisor_update\",\n+ ]\n+ },\n+ blocking=True,\n+ )\n+ freezer.tick(HASSIO_UPDATE_INTERVAL)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+\n+ assert len(issue_registry.issues) == 1\n+ issue = issue_registry.async_get_issue(\n+ \"homeassistant\", \"deprecated_method_architecture\"\n+ )\n+ assert issue.domain == \"homeassistant\"\n+ assert issue.severity == ir.IssueSeverity.WARNING\n+ assert issue.translation_placeholders == {\n+ \"installation_type\": \"Supervised\",\n+ \"arch\": arch,\n+ }\n+\n+\n+@pytest.mark.parametrize(\n+ (\"board\", \"issue_id\"),\n+ [\n+ (\"rpi5\", \"deprecated_os_aarch64\"),\n+ ],\n+)\n+async def test_deprecated_installation_issue_supported_board(\n+ hass: HomeAssistant,\n+ issue_registry: ir.IssueRegistry,\n+ freezer: FrozenDateTimeFactory,\n+ board: str,\n+ issue_id: str,\n+) -> None:\n+ \"\"\"Test no deprecated installation issue for a supported board.\"\"\"\n+ with (\n+ patch.dict(os.environ, MOCK_ENVIRON),\n+ patch(\n+ \"homeassistant.components.hassio.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant OS\",\n+ \"arch\": \"aarch64\",\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.homeassistant.async_get_system_info\",\n+ return_value={\n+ \"installation_type\": \"Home Assistant OS\",\n+ \"arch\": \"aarch64\",\n+ },\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_os_info\", return_value={\"board\": board}\n+ ),\n+ patch(\n+ \"homeassistant.components.hassio.get_info\", return_value={\"hassos\": True}\n+ ),\n+ ):\n+ assert await async_setup_component(hass, \"homeassistant\", {})\n+ config_entry = MockConfigEntry(domain=DOMAIN, data={}, unique_id=DOMAIN)\n+ config_entry.add_to_hass(hass)\n+ assert await hass.config_entries.async_setup(config_entry.entry_id)\n+ await hass.async_block_till_done()\n+ freezer.tick(REQUEST_REFRESH_DELAY)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+ await hass.services.async_call(\n+ \"homeassistant\",\n+ \"update_entity\",\n+ {\n+ \"entity_id\": [\n+ \"update.home_assistant_core_update\",\n+ \"update.home_assistant_supervisor_update\",\n+ ]\n+ },\n+ blocking=True,\n+ )\n+ freezer.tick(HASSIO_UPDATE_INTERVAL)\n+ async_fire_time_changed(hass)\n+ await hass.async_block_till_done()\n+\n+ assert len(issue_registry.issues) == 0\ndiff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py\nindex 530a729e12d71..a5e454221d317 100644\n--- a/tests/components/homeassistant/test_init.py\n+++ b/tests/components/homeassistant/test_init.py\n@@ -640,13 +640,6 @@ async def test_reload_all(\n assert len(jinja) == 1\n \n \n-@pytest.mark.parametrize(\n- \"installation_type\",\n- [\n- \"Home Assistant Core\",\n- \"Home Assistant Supervised\",\n- ],\n-)\n @pytest.mark.parametrize(\n \"arch\",\n [\n@@ -658,14 +651,13 @@ async def test_reload_all(\n async def test_deprecated_installation_issue_32bit_method(\n hass: HomeAssistant,\n issue_registry: ir.IssueRegistry,\n- installation_type: str,\n arch: str,\n ) -> None:\n \"\"\"Test deprecated installation issue.\"\"\"\n with patch(\n \"homeassistant.components.homeassistant.async_get_system_info\",\n return_value={\n- \"installation_type\": installation_type,\n+ \"installation_type\": \"Home Assistant Core\",\n \"arch\": arch,\n },\n ):\n@@ -677,18 +669,11 @@ async def test_deprecated_installation_issue_32bit_method(\n assert issue.domain == DOMAIN\n assert issue.severity == ir.IssueSeverity.WARNING\n assert issue.translation_placeholders == {\n- \"installation_type\": installation_type[15:],\n+ \"installation_type\": \"Core\",\n \"arch\": arch,\n }\n \n \n-@pytest.mark.parametrize(\n- \"installation_type\",\n- [\n- \"Home Assistant Container\",\n- \"Home Assistant OS\",\n- ],\n-)\n @pytest.mark.parametrize(\n \"arch\",\n [\n@@ -699,14 +684,13 @@ async def test_deprecated_installation_issue_32bit_method(\n async def test_deprecated_installation_issue_32bit(\n hass: HomeAssistant,\n issue_registry: ir.IssueRegistry,\n- installation_type: str,\n arch: str,\n ) -> None:\n \"\"\"Test deprecated installation issue.\"\"\"\n with patch(\n \"homeassistant.components.homeassistant.async_get_system_info\",\n return_value={\n- \"installation_type\": installation_type,\n+ \"installation_type\": \"Home Assistant Container\",\n \"arch\": arch,\n },\n ):\n@@ -718,28 +702,19 @@ async def test_deprecated_installation_issue_32bit(\n assert issue.domain == DOMAIN\n assert issue.severity == ir.IssueSeverity.WARNING\n assert issue.translation_placeholders == {\n- \"installation_type\": installation_type[15:],\n+ \"installation_type\": \"Container\",\n \"arch\": arch,\n }\n \n \n-@pytest.mark.parametrize(\n- \"installation_type\",\n- [\n- \"Home Assistant Core\",\n- \"Home Assistant Supervised\",\n- ],\n-)\n async def test_deprecated_installation_issue_method(\n- hass: HomeAssistant,\n- issue_registry: ir.IssueRegistry,\n- installation_type: str,\n+ hass: HomeAssistant, issue_registry: ir.IssueRegistry\n ) -> None:\n \"\"\"Test deprecated installation issue.\"\"\"\n with patch(\n \"homeassistant.components.homeassistant.async_get_system_info\",\n return_value={\n- \"installation_type\": installation_type,\n+ \"installation_type\": \"Home Assistant Core\",\n \"arch\": \"generic-x86-64\",\n },\n ):\n@@ -751,52 +726,11 @@ async def test_deprecated_installation_issue_method(\n assert issue.domain == DOMAIN\n assert issue.severity == ir.IssueSeverity.WARNING\n assert issue.translation_placeholders == {\n- \"installation_type\": installation_type[15:],\n+ \"installation_type\": \"Core\",\n \"arch\": \"generic-x86-64\",\n }\n \n \n-@pytest.mark.parametrize(\n- (\"board\", \"issue_id\"),\n- [\n- (\"rpi3\", \"deprecated_os_aarch64\"),\n- (\"rpi4\", \"deprecated_os_aarch64\"),\n- (\"tinker\", \"deprecated_os_armv7\"),\n- (\"odroid-xu4\", \"deprecated_os_armv7\"),\n- (\"rpi2\", \"deprecated_os_armv7\"),\n- ],\n-)\n-async def test_deprecated_installation_issue_aarch64(\n- hass: HomeAssistant,\n- issue_registry: ir.IssueRegistry,\n- board: str,\n- issue_id: str,\n-) -> None:\n- \"\"\"Test deprecated installation issue.\"\"\"\n- with (\n- patch(\n- \"homeassistant.components.homeassistant.async_get_system_info\",\n- return_value={\n- \"installation_type\": \"Home Assistant OS\",\n- \"arch\": \"armv7\",\n- },\n- ),\n- patch(\n- \"homeassistant.components.hassio.get_os_info\", return_value={\"board\": board}\n- ),\n- ):\n- assert await async_setup_component(hass, DOMAIN, {})\n- await hass.async_block_till_done()\n-\n- assert len(issue_registry.issues) == 1\n- issue = issue_registry.async_get_issue(DOMAIN, issue_id)\n- assert issue.domain == DOMAIN\n- assert issue.severity == ir.IssueSeverity.WARNING\n- assert issue.translation_placeholders == {\n- \"installation_guide\": \"https://www.home-assistant.io/installation/\",\n- }\n-\n-\n async def test_deprecated_installation_issue_armv7_container(\n hass: HomeAssistant,\n issue_registry: ir.IssueRegistry,\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"medium\",\n \"estimated_review_effort\": 3,\n \"problem_domain\": \"Bug Fixes\"\n}"}}},{"rowIdx":2399,"cells":{"instance_id":{"kind":"string","value":"getredash__redash-3008@b887f50"},"repo":{"kind":"string","value":"getredash/redash"},"language":{"kind":"string","value":"Python"},"pull_number":{"kind":"number","value":3008,"string":"3,008"},"title":{"kind":"string","value":"Google analytics fix fixes #2965"},"body":{"kind":"string","value":"resolves #2965"},"created_at":{"kind":"string","value":"2018-10-27T22:43:06Z"},"problem_statement":{"kind":"string","value":"GA Data Source throws an error when no rows returned\n### Issue Summary\r\n\r\nGoogle Analytics Data Source throws `Error running query: 'rows'` when the query result is empty.\r\nI have a pretty simple query with dimensions and filters, like:\r\n\r\n```json\r\n{\r\n \"ids\": \"ga:177xxxxxx\",\r\n \"start_date\": \"2018-10-08\",\r\n \"end_date\": \"2018-10-12\",\r\n \"metrics\": \"ga:uniqueEvents\",\r\n \"dimensions\": \"ga:dimension1,ga:dimension3\",\r\n \"filters\": \"ga:dimension2==userrole;ga:eventCategory==eventcategory;ga:eventAction==enentaction;ga:dimension1!=demo\"\r\n}\r\n```\r\n\r\nSometimes it returns empty result as there is no data. This results in error in redash.\r\n\r\n### Steps to Reproduce\r\n\r\n1. Create the Google Analytics Data Source\r\n2. Make some query returning zero rows\r\n3. Execute it in query editor\r\n\r\n`Error running query: 'rows'` will be thrown. While this might be considered not a bug, I'd expect just an empty result with no errors.\r\n\r\n### Technical details:\r\n\r\n* Redash Version: 5.0.1\r\n* Browser/OS: Chrome/macOS\r\n* How did you install Redash: docker-compose"},"hints_text":{"kind":"string","value":""},"resolved_issues":{"kind":"list like","value":[{"body":"### Issue Summary\r\n\r\nGoogle Analytics Data Source throws `Error running query: 'rows'` when the query result is empty.\r\nI have a pretty simple query with dimensions and filters, like:\r\n\r\n```json\r\n{\r\n \"ids\": \"ga:177xxxxxx\",\r\n \"start_date\": \"2018-10-08\",\r\n \"end_date\": \"2018-10-12\",\r\n \"metrics\": \"ga:uniqueEvents\",\r\n \"dimensions\": \"ga:dimension1,ga:dimension3\",\r\n \"filters\": \"ga:dimension2==userrole;ga:eventCategory==eventcategory;ga:eventAction==enentaction;ga:dimension1!=demo\"\r\n}\r\n```\r\n\r\nSometimes it returns empty result as there is no data. This results in error in redash.\r\n\r\n### Steps to Reproduce\r\n\r\n1. Create the Google Analytics Data Source\r\n2. Make some query returning zero rows\r\n3. Execute it in query editor\r\n\r\n`Error running query: 'rows'` will be thrown. While this might be considered not a bug, I'd expect just an empty result with no errors.\r\n\r\n### Technical details:\r\n\r\n* Redash Version: 5.0.1\r\n* Browser/OS: Chrome/macOS\r\n* How did you install Redash: docker-compose\r\n","number":2965,"title":"GA Data Source throws an error when no rows returned"}],"string":"[\n {\n \"body\": \"### Issue Summary\\r\\n\\r\\nGoogle Analytics Data Source throws `Error running query: 'rows'` when the query result is empty.\\r\\nI have a pretty simple query with dimensions and filters, like:\\r\\n\\r\\n```json\\r\\n{\\r\\n \\\"ids\\\": \\\"ga:177xxxxxx\\\",\\r\\n \\\"start_date\\\": \\\"2018-10-08\\\",\\r\\n \\\"end_date\\\": \\\"2018-10-12\\\",\\r\\n \\\"metrics\\\": \\\"ga:uniqueEvents\\\",\\r\\n \\\"dimensions\\\": \\\"ga:dimension1,ga:dimension3\\\",\\r\\n \\\"filters\\\": \\\"ga:dimension2==userrole;ga:eventCategory==eventcategory;ga:eventAction==enentaction;ga:dimension1!=demo\\\"\\r\\n}\\r\\n```\\r\\n\\r\\nSometimes it returns empty result as there is no data. This results in error in redash.\\r\\n\\r\\n### Steps to Reproduce\\r\\n\\r\\n1. Create the Google Analytics Data Source\\r\\n2. Make some query returning zero rows\\r\\n3. Execute it in query editor\\r\\n\\r\\n`Error running query: 'rows'` will be thrown. While this might be considered not a bug, I'd expect just an empty result with no errors.\\r\\n\\r\\n### Technical details:\\r\\n\\r\\n* Redash Version: 5.0.1\\r\\n* Browser/OS: Chrome/macOS\\r\\n* How did you install Redash: docker-compose\\r\\n\",\n \"number\": 2965,\n \"title\": \"GA Data Source throws an error when no rows returned\"\n }\n]","isConversational":false},"base_commit":{"kind":"string","value":"ab6ed7da34dd2797914382c435981450b7bf9d7a"},"commit_to_review":{"kind":"string","value":"{\n \"head_commit\": \"b887f502c56ed83c3c8ff68bc9d65311be3c00f8\",\n \"head_commit_message\": \"resolves #2965\",\n \"patch_to_review\": \"diff --git a/redash/query_runner/google_analytics.py b/redash/query_runner/google_analytics.py\\nindex e8b70eb01f..19def81243 100644\\n--- a/redash/query_runner/google_analytics.py\\n+++ b/redash/query_runner/google_analytics.py\\n@@ -43,36 +43,37 @@ def parse_ga_response(response):\\n })\\n \\n rows = []\\n- for r in response['rows']:\\n- d = {}\\n- for c, value in enumerate(r):\\n- column_name = response['columnHeaders'][c]['name']\\n- column_type = filter(lambda col: col['name'] == column_name, columns)[0]['type']\\n-\\n- # mcf results come a bit different than ga results:\\n- if isinstance(value, dict):\\n- if 'primitiveValue' in value:\\n- value = value['primitiveValue']\\n- elif 'conversionPathValue' in value:\\n- steps = []\\n- for step in value['conversionPathValue']:\\n- steps.append('{}:{}'.format(step['interactionType'], step['nodeValue']))\\n- value = ', '.join(steps)\\n- else:\\n- raise Exception(\\\"Results format not supported\\\")\\n-\\n- if column_type == TYPE_DATE:\\n- value = datetime.strptime(value, '%Y%m%d')\\n- elif column_type == TYPE_DATETIME:\\n- if len(value) == 10:\\n- value = datetime.strptime(value, '%Y%m%d%H')\\n- elif len(value) == 12:\\n- value = datetime.strptime(value, '%Y%m%d%H%M')\\n- else:\\n- raise Exception(\\\"Unknown date/time format in results: '{}'\\\".format(value))\\n-\\n- d[column_name] = value\\n- rows.append(d)\\n+ if response and 'rows' in response:\\n+ for r in response['rows']:\\n+ d = {}\\n+ for c, value in enumerate(r):\\n+ column_name = response['columnHeaders'][c]['name']\\n+ column_type = filter(lambda col: col['name'] == column_name, columns)[0]['type']\\n+\\n+ # mcf results come a bit different than ga results:\\n+ if isinstance(value, dict):\\n+ if 'primitiveValue' in value:\\n+ value = value['primitiveValue']\\n+ elif 'conversionPathValue' in value:\\n+ steps = []\\n+ for step in value['conversionPathValue']:\\n+ steps.append('{}:{}'.format(step['interactionType'], step['nodeValue']))\\n+ value = ', '.join(steps)\\n+ else:\\n+ raise Exception(\\\"Results format not supported\\\")\\n+\\n+ if column_type == TYPE_DATE:\\n+ value = datetime.strptime(value, '%Y%m%d')\\n+ elif column_type == TYPE_DATETIME:\\n+ if len(value) == 10:\\n+ value = datetime.strptime(value, '%Y%m%d%H')\\n+ elif len(value) == 12:\\n+ value = datetime.strptime(value, '%Y%m%d%H%M')\\n+ else:\\n+ raise Exception(\\\"Unknown date/time format in results: '{}'\\\".format(value))\\n+\\n+ d[column_name] = value\\n+ rows.append(d)\\n \\n return {'columns': columns, 'rows': rows}\\n \\n\"\n}"},"reference_review_comments":{"kind":"list like","value":[{"diff_hunk":"@@ -43,36 +43,37 @@ def parse_ga_response(response):\n })\n \n rows = []\n- for r in response['rows']:\n- d = {}\n- for c, value in enumerate(r):\n- column_name = response['columnHeaders'][c]['name']\n- column_type = filter(lambda col: col['name'] == column_name, columns)[0]['type']\n-\n- # mcf results come a bit different than ga results:\n- if isinstance(value, dict):\n- if 'primitiveValue' in value:\n- value = value['primitiveValue']\n- elif 'conversionPathValue' in value:\n- steps = []\n- for step in value['conversionPathValue']:\n- steps.append('{}:{}'.format(step['interactionType'], step['nodeValue']))\n- value = ', '.join(steps)\n- else:\n- raise Exception(\"Results format not supported\")\n-\n- if column_type == TYPE_DATE:\n- value = datetime.strptime(value, '%Y%m%d')\n- elif column_type == TYPE_DATETIME:\n- if len(value) == 10:\n- value = datetime.strptime(value, '%Y%m%d%H')\n- elif len(value) == 12:\n- value = datetime.strptime(value, '%Y%m%d%H%M')\n- else:\n- raise Exception(\"Unknown date/time format in results: '{}'\".format(value))\n-\n- d[column_name] = value\n- rows.append(d)\n+ if response and 'rows' in response:\n+ for r in response['rows']:","line":null,"original_line":47,"original_start_line":null,"path":"redash/query_runner/google_analytics.py","start_line":null,"text":"@user1:\nWe can assume `response` exists because otherwise this function will fail when trying to load the columns. In this case, maybe we can simplify this with a `for r in response.get('rows', []):`, so we don't need the extra indentation? \n\n@author:\nok.\r\ndone!"}],"string":"[\n {\n \"diff_hunk\": \"@@ -43,36 +43,37 @@ def parse_ga_response(response):\\n })\\n \\n rows = []\\n- for r in response['rows']:\\n- d = {}\\n- for c, value in enumerate(r):\\n- column_name = response['columnHeaders'][c]['name']\\n- column_type = filter(lambda col: col['name'] == column_name, columns)[0]['type']\\n-\\n- # mcf results come a bit different than ga results:\\n- if isinstance(value, dict):\\n- if 'primitiveValue' in value:\\n- value = value['primitiveValue']\\n- elif 'conversionPathValue' in value:\\n- steps = []\\n- for step in value['conversionPathValue']:\\n- steps.append('{}:{}'.format(step['interactionType'], step['nodeValue']))\\n- value = ', '.join(steps)\\n- else:\\n- raise Exception(\\\"Results format not supported\\\")\\n-\\n- if column_type == TYPE_DATE:\\n- value = datetime.strptime(value, '%Y%m%d')\\n- elif column_type == TYPE_DATETIME:\\n- if len(value) == 10:\\n- value = datetime.strptime(value, '%Y%m%d%H')\\n- elif len(value) == 12:\\n- value = datetime.strptime(value, '%Y%m%d%H%M')\\n- else:\\n- raise Exception(\\\"Unknown date/time format in results: '{}'\\\".format(value))\\n-\\n- d[column_name] = value\\n- rows.append(d)\\n+ if response and 'rows' in response:\\n+ for r in response['rows']:\",\n \"line\": null,\n \"original_line\": 47,\n \"original_start_line\": null,\n \"path\": \"redash/query_runner/google_analytics.py\",\n \"start_line\": null,\n \"text\": \"@user1:\\nWe can assume `response` exists because otherwise this function will fail when trying to load the columns. In this case, maybe we can simplify this with a `for r in response.get('rows', []):`, so we don't need the extra indentation? \\n\\n@author:\\nok.\\r\\ndone!\"\n }\n]","isConversational":false},"merged_commit":{"kind":"string","value":"e153823e9bb6371221704fd7fe9e98180b317822"},"merged_patch":{"kind":"string","value":"diff --git a/redash/query_runner/google_analytics.py b/redash/query_runner/google_analytics.py\nindex e8b70eb01f..71be522015 100644\n--- a/redash/query_runner/google_analytics.py\n+++ b/redash/query_runner/google_analytics.py\n@@ -43,7 +43,7 @@ def parse_ga_response(response):\n })\n \n rows = []\n- for r in response['rows']:\n+ for r in response.get('rows', []):\n d = {}\n for c, value in enumerate(r):\n column_name = response['columnHeaders'][c]['name']\n"},"metadata":{"kind":"string","value":"{\n \"difficulty\": \"low\",\n \"estimated_review_effort\": 2,\n \"problem_domain\": \"Bug Fixes\"\n}"}}}],"truncated":false,"partial":false},"paginationData":{"pageIndex":23,"numItemsPerPage":100,"numTotalItems":7086,"offset":2300,"length":100}},"jwt":"eyJhbGciOiJFZERTQSIsImtpZCI6IjVHZDBvd0g5MTM2eDZjc1FvbE1zcktNWUZoRVFoUm5PVVVybEpjOUhaUEEifQ.eyJyZWFkIjp0cnVlLCJwZXJtaXNzaW9ucyI6eyJyZXBvLmNvbnRlbnQucmVhZCI6dHJ1ZX0sImlhdCI6MTc4Njc5NzkzOCwianRpIjoiN2ZjODE0OWYtNjA1OS00Njk0LTg4ZmEtODQ2YmE3ZjUxYmRiIiwic3ViIjoiL2RhdGFzZXRzL2luY2x1c2lvbkFJL1NXRS1DQVJFIiwiZXhwIjoxNzg2ODAxNTM4LCJpc3MiOiJodHRwczovL2h1Z2dpbmdmYWNlLmNvIn0.rbd_CDTzrKYeZFF9U-49UNuwAlCKzs6F7AW7mo7z3GINepfnTufoZRsop8kLlm4_Dd7tMHYH7SLVWbxMoPNmDA","displayUrls":true,"splitSizeSummaries":[{"config":"default","split":"dev","numRows":7086,"numBytesParquet":125079708},{"config":"default","split":"test","numRows":671,"numBytesParquet":12126296}]},"discussionsStats":{"closed":0,"open":1,"total":1},"fullWidth":true,"hasGatedAccess":true,"hasFullAccess":true,"isEmbedded":false,"savedQueries":{"community":[{"views":[{"key":"default/test","displayName":"test","viewName":"test"}],"sql":"-- The SQL console is powered by DuckDB WASM and runs entirely in the browser.\n-- Get started by typing a query or selecting a view from the options below.\nSELECT instance_id , base_commit ,problem_statement,commit_to_review FROM test LIMIT 10;","title":"Review Test Instances","createdAt":"2026-01-14T03:09:29.315Z","slug":"JAW4VpX","private":false,"justification":"Retrieves basic metadata about code review instances but doesn't provide any analytical insights or patterns beyond raw data access.","viewNames":["test"]}],"user":[]}}">
instance_id stringlengths 21 53 | repo stringclasses 188
values | language stringclasses 1
value | pull_number int64 20 148k | title stringlengths 6 144 | body stringlengths 0 83.4k | created_at stringdate 2015-09-25 03:17:17 2025-07-10 16:50:35 | problem_statement stringlengths 188 240k | hints_text stringlengths 0 145k | resolved_issues listlengths 1 6 | base_commit stringlengths 40 40 | commit_to_review dict | reference_review_comments listlengths 1 62 | merged_commit stringlengths 40 40 | merged_patch stringlengths 297 9.87M | metadata dict |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
dbt-labs__dbt-core-8117@80d6267 | dbt-labs/dbt-core | Python | 8,117 | Ensure that target_schema from snapshot config is promoted to node level | resolves #6745
### Problem
Snapshot target_schema and target_database were being processed when the snapshot nodes were processed, but those config fields were not being promoted to the node level schema and database if set in config in dbt_proejct.yml or a schema yaml file.
### Solution
Added code to the... | 2023-07-17T20:53:28Z | [CT-1913] Snapshot target_schema & target_database used from dbt_project.yml
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
Profiles.yml
```
dev:
t... | Thank you for reaching out about this @minhajpasha !
p.s. I added some ` ``` ` to your description to help format each or your YAML examples -- hope you don't mind.
I was able to reproduce what you described, and I agree this is a bug. It _might_ be related to https://github.com/dbt-labs/dbt-core/issues/4000
#... | [
{
"body": "### Is this a new bug in dbt-core?\r\n\r\n- [X] I believe this is a new bug in dbt-core\r\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\r\n\r\n### Current Behavior\r\n\r\nProfiles.yml\r\n```\r\n dev:\r\n type: bigquery\r\n method: oauth\r... | 203bd8defd023460a364400cad0422594aa8857c | {
"head_commit": "80d62673dfab48d8cdcee2b55b81a540d7c1a6f8",
"head_commit_message": "Update test",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230717-160652.yaml b/.changes/unreleased/Fixes-20230717-160652.yaml\nnew file mode 100644\nindex 00000000000..8c63a584db9\n--- /dev/null\n+++ b/.changes/u... | [
{
"diff_hunk": "@@ -280,9 +279,18 @@ def update_parsed_node_config_dict(\n def update_parsed_node_relation_names(\n self, parsed_node: IntermediateNode, config_dict: Dict[str, Any]\n ) -> None:\n- self._update_node_database(parsed_node, config_dict)\n- self._update_node_schema(pars... | fa45019dbe84dfecfa0e14f9cc22a55f415a05c1 | diff --git a/.changes/unreleased/Fixes-20230717-160652.yaml b/.changes/unreleased/Fixes-20230717-160652.yaml
new file mode 100644
index 00000000000..8c63a584db9
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230717-160652.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Copy target_schema from config into snapshot node
+time:... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-8250@746a8b6 | dbt-labs/dbt-core | Python | 8,250 | [CT-2888] Support dbt-semantic-interfaces 0.2.0 | resolves #8247
### Problem
There is a bug currently in core main and 1.6.latest where-in daemonic invocations of core get killed off due to a multi processing in DSI 0.1.0rc1. This is fixed in DSI 0.2.0 Additionally there are breaking changes in DSI 0.2.0 that we need to in core (and backported to core 1.6). Thi... | 2023-07-28T20:55:01Z | [CT-2888] Support DSI 0.2.0
DSI 0.2.0 is dropping soon. It has a fix for an a runtime exception being encountered when dbt-core is run in a daemonic environment. There are additionally some breaking protocol changes that come with it that we'll need to support. This work will need to get backported to 1.6.latest | [
{
"body": "DSI 0.2.0 is dropping soon. It has a fix for an a runtime exception being encountered when dbt-core is run in a daemonic environment. There are additionally some breaking protocol changes that come with it that we'll need to support. This work will need to get backported to 1.6.latest",
"number":... | 5b6d21d7da00847e694111e21724a59053b36e76 | {
"head_commit": "746a8b6a1377e53c30cba81790f7a6316a47f851",
"head_commit_message": "Fix metric filter specifications in existing tests",
"patch_to_review": "diff --git a/core/dbt/contracts/graph/nodes.py b/core/dbt/contracts/graph/nodes.py\nindex 3e191e90855..59ac576db79 100644\n--- a/core/dbt/contracts/graph/no... | [
{
"diff_hunk": "@@ -0,0 +1,6 @@\n+kind: Dependencies\n+body: Support dbt-semantic-interfaces 0.2.0\n+time: 2023-07-28T13:52:27.207241-07:00\n+custom:\n+ Author: QMalcolm\n+ PR: \"8247\"",
"line": null,
"original_line": 6,
"original_start_line": null,
"path": ".changes/unreleased/Dependencies-2... | 2c6d0da6aabf5eed4ed32511622a9b177833f763 | diff --git a/.changes/unreleased/Dependencies-20230728-135227.yaml b/.changes/unreleased/Dependencies-20230728-135227.yaml
new file mode 100644
index 00000000000..3373d055c3e
--- /dev/null
+++ b/.changes/unreleased/Dependencies-20230728-135227.yaml
@@ -0,0 +1,6 @@
+kind: Dependencies
+body: Support dbt-semantic-interfa... | {
"difficulty": "high",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-7706@05d298b | dbt-labs/dbt-core | Python | 7,706 | Target path should be relative to project dir, rather than current working directory | resolves #7465
### Description
With version 1.5 we no longer did a chdir to the project directory in the same places as in previous releases.
There are two ways this could be fixed: 1) Always do a chdir to the project directory for every command, 2) construct paths based on the project root directory.
In ... | 2023-05-25T21:02:05Z | [CT-2491] [Bug] Default `--target-path` should be relative to `--project-dir`, rather than current working directory
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
Exe... | @OwenKephart Thanks for opening, and for trying out the v1.5 RC!
We did need to make some low-level changes to how `--target-path` works in v1.5.0. This is called out in the migration guide:
> Setting `log-path` and `target-path` in dbt_project.yml has been deprecated for consistency with other invocation-specifi... | [
{
"body": "### Is this a new bug in dbt-core?\n\n- [X] I believe this is a new bug in dbt-core\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\n\n### Current Behavior\n\nExecuting a command that targets a project in a specified `--project-dir` results in the json ... | 7e3a6eec96d55363501be4d01c0328030a1ec51b | {
"head_commit": "05d298b7624d363138ed64cad6edd6f507a0447e",
"head_commit_message": "Remove resolve_path from state click.Path, modify defer_state test to\ntest",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230525-165053.yaml b/.changes/unreleased/Fixes-20230525-165053.yaml\nnew file mode 100644\... | [
{
"diff_hunk": "@@ -41,7 +43,7 @@ def __init__(self, path: Path, current_path: Path):\n exc.add_filename(str(sources_path))\n raise\n \n- sources_current_path = self.current_path / \"sources.json\"\n+ sources_current_path = self.target_path / \"sources.json\"",
... | 51a2ebbaac6af9eac0cec768c8eec22332a0c08f | diff --git a/.changes/unreleased/Fixes-20230525-165053.yaml b/.changes/unreleased/Fixes-20230525-165053.yaml
new file mode 100644
index 00000000000..89dcd6ddf60
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230525-165053.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Incorrect paths used for "target" and "state" directorie... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-7862@c8509a8 | dbt-labs/dbt-core | Python | 7,862 | Add AdapterRegistered event log message | resolves #7038
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
-->
### Description
<!---
Describe the Pull Request here. Add any references and info to ... | 2023-06-13T22:21:54Z | [CT-2171] [Feature] Add adapter(s) version(s) to the log
It would make things much easier when debugging a dbt invocation, if the adapter version were present.
Right now we get (below for a `dbt debug`)
```
============================== 2023-02-22 23:21:37.421632 | d8954cb4-b0c3-461a-a0f1-68c918c2fe23 =========... | @VersusFacit that's one you may be interested in contributing to, even though that's pretty core ;)
➕
yes! related older issue (which we never had the priority/capacity to pick up):
- https://github.com/dbt-labs/dbt-core/issues/5124
Love me some tooling. And I certainly enjoy working on the `tasks/` dir in `core`! ... | [
{
"body": "It would make things much easier when debugging a dbt invocation, if the adapter version were present.\r\n\r\nRight now we get (below for a `dbt debug`)\r\n\r\n```\r\n============================== 2023-02-22 23:21:37.421632 | d8954cb4-b0c3-461a-a0f1-68c918c2fe23 ==============================\r\n\u0... | b947b2bc7e6513273398ea19fb1064ab8519f0be | {
"head_commit": "c8509a895514af5e410603efe58ae59910439d4d",
"head_commit_message": "Add AdapterRegistered to unit test",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20230613-151507.yaml b/.changes/unreleased/Features-20230613-151507.yaml\nnew file mode 100644\nindex 00000000000..88b6adb66b3\n--... | [
{
"diff_hunk": "@@ -89,7 +89,8 @@ def load_plugin(self, name: str) -> Type[Credentials]:\n def register_adapter(self, config: AdapterRequiredConfig) -> None:\n adapter_name = config.credentials.type\n adapter_type = self.get_adapter_class_by_name(adapter_name)\n-\n+ adapter_version = ... | 823a360d8df25f57a549053cec831af4b95b01c7 | diff --git a/.changes/unreleased/Features-20230613-151507.yaml b/.changes/unreleased/Features-20230613-151507.yaml
new file mode 100644
index 00000000000..88b6adb66b3
--- /dev/null
+++ b/.changes/unreleased/Features-20230613-151507.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Add AdapterRegistered event log message
+tim... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-7743@81f7775 | dbt-labs/dbt-core | Python | 7,743 | fix: removing dependency from dependencies.yml | resolves https://github.com/dbt-labs/dbt-core/issues/7745
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
-->
### Description
<!---
Describe the Pull Req... | 2023-05-31T14:53:44Z | [CT-2614] [Bug] Removing project dependency from dependencies.yml between runs causes RuntimeError
Going from:
```
-- dependencies.yml
projects:
- name: project_a
```
to:
```
-- dependencies.yml
projects: []
```
causes:
```python
File "/Users/michelleark/src/dbt-core/core/dbt/parser/manifest.py", ... | [
{
"body": "Going from: \r\n```\r\n-- dependencies.yml\r\nprojects:\r\n - name: project_a\r\n```\r\nto: \r\n```\r\n-- dependencies.yml\r\nprojects: []\r\n```\r\n\r\ncauses: \r\n```python\r\n File \"/Users/michelleark/src/dbt-core/core/dbt/parser/manifest.py\", line 791, in build_public_nodes\r\n for project... | 8e1c4ec116e8968eb1cec39e713dbebed0e6a76c | {
"head_commit": "81f7775d1da3154002cc9f55fefb5cc3b61ddd51",
"head_commit_message": "changelog entry",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230605-124425.yaml b/.changes/unreleased/Fixes-20230605-124425.yaml\nnew file mode 100644\nindex 00000000000..09c23e3f296\n--- /dev/null\n+++ b/.chang... | [
{
"diff_hunk": "@@ -804,3 +810,26 @@ def test_pp_groups(self, project):\n )\n with pytest.raises(ParsingError):\n results = run_dbt([\"--partial-parse\", \"run\"])\n+\n+\n+class TestDependencies:\n+ @pytest.fixture(scope=\"class\")\n+ def models(self):\n+ return {\"order... | 96c70d79232d3d889c068f9d385aadedf16b797e | diff --git a/.changes/unreleased/Fixes-20230605-124425.yaml b/.changes/unreleased/Fixes-20230605-124425.yaml
new file mode 100644
index 00000000000..09c23e3f296
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230605-124425.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: fix RuntimeError when removing project dependency from d... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-7276@acfae95 | dbt-labs/dbt-core | Python | 7,276 | Initial implementation of cross-project ref | resolves #7227
### Description
Initial implementation of cross project refs, including writing out publication artifacts, ingesting publication artifacts from other projects, constructing public nodes and resolving references to public nodes at runtime.
### Checklist
- [x] I have read [the contributing guid... | 2023-04-05T15:26:36Z | [CT-2327] [Spike] Produce publication artifact and resolve cross-project refs
Write a new 'publication artifact' as a result of dbt invocations. This artifact should contain the set of _logical_ project state necessary for downstream projects to take dependencies (resolve refs) to public models in the producer project.... | _Paraphrasing from some conversations with @bossnunta_
**`dbt list`** should include information about public models in upstream projects:
- with a clear attribute saying that this is a node _not_ in this project / an installed package (let's not call this `external_nodes`, since that's taken on a different meaning... | [
{
"body": "Write a new 'publication artifact' as a result of dbt invocations. This artifact should contain the set of _logical_ project state necessary for downstream projects to take dependencies (resolve refs) to public models in the producer project. \r\n\r\nMinimally, the publication artifact would contain:... | f1dddaa6e96b743498440925a55e66a7d5cdacfa | {
"head_commit": "acfae95cf6fe9d886d1e2bd43e4dadafc91ccdf9",
"head_commit_message": "Add public_nodes to flat_graph",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20230420-124756.yaml b/.changes/unreleased/Features-20230420-124756.yaml\nnew file mode 100644\nindex 00000000000..c1ee4eb71ae\n--- /d... | [
{
"diff_hunk": "@@ -0,0 +1,110 @@\n+from typing import Optional, List, Dict, Any\n+from datetime import datetime\n+from dbt.dataclass_schema import dbtClassMixin\n+\n+from dataclasses import dataclass, field\n+\n+from dbt.contracts.util import BaseArtifactMetadata, ArtifactMixin, schema_version\n+from dbt.contr... | 7471b2f349227a91dfacb95154c4a70b887d5bc6 | diff --git a/.changes/unreleased/Features-20230420-124756.yaml b/.changes/unreleased/Features-20230420-124756.yaml
new file mode 100644
index 00000000000..c1ee4eb71ae
--- /dev/null
+++ b/.changes/unreleased/Features-20230420-124756.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Publication artifacts and cross-project ref
... | {
"difficulty": "high",
"estimated_review_effort": 5,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-7180@0829ff7 | dbt-labs/dbt-core | Python | 7,180 | CT-2049: Add CommandCompleted event | resolves #6878
### Description
[CT-2049](https://github.com/dbt-labs/dbt-core/issues/6878) outlines a desire to have an event that is output on completion of any and every command. This PR adds that functionality. Below is a demo of the functionality in a loom video (clicking will redirect you to loom)
<a hre... | 2023-03-16T19:28:55Z | [CT-2049] Fire an event at the end of every command
On the `feature/click-cli` branch, each command explicitly returns a tuple of `success: bool, results: Any`. (The structure of `results` differs based on the command.)
We should additionally fire an event that can be used programmatically to determine:
- when the ... | Super agree with this. I suggest that we might want to have a CommandCompleted event that contains the data common to all commands, such as timing and success, and refer to an additional event that would contain more of the specific Result dump. We could do a "oneof" of all of the various Result objects, but the way th... | [
{
"body": "On the `feature/click-cli` branch, each command explicitly returns a tuple of `success: bool, results: Any`. (The structure of `results` differs based on the command.)\r\n\r\nWe should additionally fire an event that can be used programmatically to determine:\r\n- when the command completed\r\n- if t... | 4186f99b742b47e0e95aca4f604cc09e5c67a449 | {
"head_commit": "0829ff7226c9aca855b24012065a78a8b696dd32",
"head_commit_message": "add CommandCompleted event to event unit tests",
"patch_to_review": "diff --git a/core/dbt/cli/requires.py b/core/dbt/cli/requires.py\nindex 57f0df82795..0867e17fe92 100644\n--- a/core/dbt/cli/requires.py\n+++ b/core/dbt/cli/requ... | [
{
"diff_hunk": "@@ -1827,6 +1827,16 @@ def message(self) -> str:\n return \"No nodes selected!\"\n \n \n+@dataclass\n+class CommandCompleted(InfoLevel, pt.CommandCompleted):",
"line": null,
"original_line": 1831,
"original_start_line": null,
"path": "core/dbt/events/types.py",
"start... | 92cec272ca70c276b892bdec412f46a73fe15ec0 | diff --git a/.changes/unreleased/Under the Hood-20230316-123305.yaml b/.changes/unreleased/Under the Hood-20230316-123305.yaml
new file mode 100644
index 00000000000..8aace685284
--- /dev/null
+++ b/.changes/unreleased/Under the Hood-20230316-123305.yaml
@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Add CommandComplete... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-7175@a57266a | dbt-labs/dbt-core | Python | 7,175 | Deprecate more env vars | resolves #6903
### Description
Deprecate the rest of the environment variables outlined in the issue.
### Checklist
- [X] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [X] I have signed the [CLA](https://docs.getd... | 2023-03-15T17:28:22Z | [CT-2066] Handle old param/flag names in new CLI
We're renaming some flags to match the common naming convention:
- `no_print` → `print`
- `flags.DEFER_MODE` / (env var) `DBT_DEFER_TO_STATE` → `defer`
- `flags.FAVOR_STATE_MODE` → `favor_state`
- `flags.ARTIFACT_STATE_PATH` / (env var) `DBT_ARTIFACT_S... | After speaking with @iknox-fa, we can keep the `send_anonymous_usage_stats` as is, as it conforms with existing naming of params. I will edit the issue description to remove this change, and any mentions of the `UserConfig`, as this was the only env var held in `UserConfig`.
@stu-k The `no_print` → `print` rename ... | [
{
"body": "We're renaming some flags to match the common naming convention:\r\n- `no_print` → `print`\r\n- `flags.DEFER_MODE` / (env var) `DBT_DEFER_TO_STATE` → `defer`\r\n- `flags.FAVOR_STATE_MODE` → `favor_state`\r\n- `flags.ARTIFACT_STATE_PATH` / (env var) `DBT_ARTIFACT_STATE_PATH` → `sta... | 4186f99b742b47e0e95aca4f604cc09e5c67a449 | {
"head_commit": "a57266aa4f37602dd7476ccb1ec74e7b202aa713",
"head_commit_message": "Deprecate more env vars",
"patch_to_review": "diff --git a/.changes/unreleased/Under the Hood-20230315-122723.yaml b/.changes/unreleased/Under the Hood-20230315-122723.yaml\nnew file mode 100644\nindex 00000000000..d99b7133b3b\n-... | [
{
"diff_hunk": "@@ -42,6 +42,7 @@ def wrapper(*args, **kwargs):\n \n # Deprecation warnings\n [dep_fn() for dep_fn in flags.deprecated_env_var_warnings]",
"line": null,
"original_line": 44,
"original_start_line": null,
"path": "core/dbt/cli/requires.py",
"start_line": null,
... | 733d4729c64ff1cfaf1c7f2de311e0f0d041cc2b | diff --git a/.changes/unreleased/Under the Hood-20230315-122723.yaml b/.changes/unreleased/Under the Hood-20230315-122723.yaml
new file mode 100644
index 00000000000..d99b7133b3b
--- /dev/null
+++ b/.changes/unreleased/Under the Hood-20230315-122723.yaml
@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Deprecate additiona... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-6961@8415ffb | dbt-labs/dbt-core | Python | 6,961 | CT 1921 add missing nodes to previous state test | resolves #6752, #6753
### Description
Improve coverage of previous state tests and fix error in WritableManifest.disabled definition to include metrics and exposures.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what'... | 2023-02-13T22:09:20Z | [CT-1920] [Bug] Running dbt with state comparison fails if an exposure is disabled
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
State comparison fails (i.e. `... | Hey @rileyschack thanks for "exposing" this situation!
Based on the error message you got using `dbt-core==1.3.2`, I suspect it's because `ParsedExposure` is not in the list [here](https://github.com/dbt-labs/dbt-core/blob/e402241e0e0779c60c0ecb568ef4d4231b7e4775/schemas/dbt/manifest/v7.json#L119-L183).
We just r... | [
{
"body": "### Is this a new bug in dbt-core?\r\n\r\n- [X] I believe this is a new bug in dbt-core\r\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\r\n\r\n### Current Behavior\r\n\r\nState comparison fails (i.e. `dbt run -s state:modified -t dev --state prod-targ... | d7a2f77705de2b78cfbdab58326f9957dda40556 | {
"head_commit": "8415ffb98024f743b077acec13411571faf0201f",
"head_commit_message": "Changie",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230213-170723.yaml b/.changes/unreleased/Fixes-20230213-170723.yaml\nnew file mode 100644\nindex 00000000000..5994cb829b6\n--- /dev/null\n+++ b/.changes/unrel... | [
{
"diff_hunk": "@@ -82,7 +300,11 @@ def compare_previous_state(\n ]\n if expect_pass:\n results = run_dbt(cli_args, expect_pass=expect_pass)\n- assert len(results) == 0\n+ # We have different numbers of nodes in older versions\n+ if compare_manifest_v... | 24ab3d0e5b214f2757efe786dbe01d64edd365b9 | diff --git a/.changes/unreleased/Fixes-20230213-170723.yaml b/.changes/unreleased/Fixes-20230213-170723.yaml
new file mode 100644
index 00000000000..5994cb829b6
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230213-170723.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix previous state tests and disabled exposures, metrics... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-6990@3eaa5bd | dbt-labs/dbt-core | Python | 6,990 | fix small issues with flags and logger to support dbt-rpc | resolves #6979 https://github.com/dbt-labs/dbt-rpc/issues/122
The helper functions are not in ideal situation but I think we can revisit them in the revisit of Flags module that's happening soon | 2023-02-16T01:48:13Z | [CT-2123] [Bug] Flags are referenced incorrectly (and sometimes at the wrong time) in functions.py
### Current Behavior
Since the merge of the click-cli feature branch, the flags USE_COLOR and LOG_CACHE_EVENTS are accessed inconsistently and sometimes before their values are ready. Consider the following from func... | [
{
"body": "\r\n### Current Behavior\r\n\r\nSince the merge of the click-cli feature branch, the flags USE_COLOR and LOG_CACHE_EVENTS are accessed inconsistently and sometimes before their values are ready. Consider the following from functions.py:\r\n```python\r\ndef _get_logbook_log_config(debug: bool) -> Logg... | 971b38c26b6f2490b96efa7fd40d5aa316da51e2 | {
"head_commit": "3eaa5bd3e82264e0b3daeae6e554bcd63127ee1b",
"head_commit_message": "fix small issues with flags and logger to support dbt-rpc",
"patch_to_review": "diff --git a/core/dbt/cli/flags.py b/core/dbt/cli/flags.py\nindex 3506049ba4b..5d0a06189f5 100644\n--- a/core/dbt/cli/flags.py\n+++ b/core/dbt/cli/fl... | [
{
"diff_hunk": "@@ -133,7 +140,7 @@ def cleanup_event_logger():\n EVENT_MANAGER.add_logger(\n _get_logbook_log_config(debug=False) # type: ignore\n if ENABLE_LEGACY_LOGGER\n- else _get_stdout_config(log_format=\"text\", debug=False, use_colors=True) # type: ignore\n+ else _get_stdout_config(log_... | 58f4ca0598ec1695ccb8e37858f8b188f3433929 | diff --git a/core/dbt/cli/flags.py b/core/dbt/cli/flags.py
index 3506049ba4b..95980de4ffa 100644
--- a/core/dbt/cli/flags.py
+++ b/core/dbt/cli/flags.py
@@ -8,7 +8,7 @@
from typing import Set, List
from click import Context, get_current_context, BadOptionUsage
-from click.core import ParameterSource
+from click.cor... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-6851@5dfbfdf | dbt-labs/dbt-core | Python | 6,851 | Add back `depends_on` for seeds - only `macros`, never `nodes` | resolves #6806
### Description
- Seeds can have pre/post hooks that call macros, and we need to track these in the seed's `depends_on`
- If those macros try to take a dependency on another node, this is an unsupported anti-pattern — raise an explicit error
I'm not thrilled with this approach, which requires a... | 2023-02-03T12:57:49Z | [CT-1984] [Regression] In v1.4, seeds with hooks calling macros raise an AttributeError
### Is this a regression in a recent version of dbt-core?
- [X] I believe this is a regression in dbt-core functionality
- [X] I have searched the existing issues, and I could not find an existing issue for this regression
##... | Think I narrowed it down..
There are seeds in my project that have a post-hook that calls a macro.
e.g.
```
seeds:
quote_columns: false
my_project:
reporting:
+schema: reporting
+post-hook:
- "{{ apply_masking_policy('models') }}"
```
Works ok on previous? Need to tr... | [
{
"body": "### Is this a regression in a recent version of dbt-core?\r\n\r\n- [X] I believe this is a regression in dbt-core functionality\r\n- [X] I have searched the existing issues, and I could not find an existing issue for this regression\r\n\r\n### Current Behavior\r\n\r\nAfter trying to upgrade both dbt-... | b2ea2b8b256e5db1da0b712dfedd7973e1e50a37 | {
"head_commit": "5dfbfdf8a0ef716913e4add8b1e23d75960c08f9",
"head_commit_message": "Be less magical",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230203-135557.yaml b/.changes/unreleased/Fixes-20230203-135557.yaml\nnew file mode 100644\nindex 00000000000..c7b5c3ec265\n--- /dev/null\n+++ b/.chang... | [
{
"diff_hunk": "@@ -523,6 +525,39 @@ def empty(self):\n \"\"\"Seeds are never empty\"\"\"\n return False\n \n+ def disallow_implicit_dependencies(self):",
"line": null,
"original_line": 528,
"original_start_line": null,
"path": "core/dbt/contracts/graph/nodes.py",
"start_l... | 956a2ffd7195211ae38acd30c8f3dcda0b5670e2 | diff --git a/.changes/unreleased/Fixes-20230203-135557.yaml b/.changes/unreleased/Fixes-20230203-135557.yaml
new file mode 100644
index 00000000000..c7b5c3ec265
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230203-135557.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Readd depends_on.macros to SeedNode, to support seeds wi... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-7216@2f0d6b7 | dbt-labs/dbt-core | Python | 7,216 | Detect breaking changes to column names and data types in state:modified check | resolves #6869
### Description
Add "same_contract", "state:modified.contract" to defer_state checks, create new exception and tests.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [x] I have s... | 2023-03-23T17:34:14Z | [CT-2038] Detect breaking changes to column names and data types in state:modified check
If a model with `contract:true` has its column name/data types modified in a way that represents a breaking change, dbt should raise an error as part of the `state:modified` check.
What constitutes a breaking change?
- Removal... | Do we want this exception to be limited to commands where the user has explicitly selected `state:modified`? Or as soon as [previous state](https://github.com/dbt-labs/dbt-core/blob/b9fdfd9e3641e38ff4c96d3b20c5773e1ff50d54/core/dbt/task/runnable.py#L117-L124) is established? Although it feels a bit odd, I think I'm oka... | [
{
"body": "If a model with `contract:true` has its column name/data types modified in a way that represents a breaking change, dbt should raise an error as part of the `state:modified` check. \r\n\r\nWhat constitutes a breaking change?\r\n- Removal of column\r\n- name change of column\r\n- data_type change of c... | ab496af1f061f8b5268d3b522b802a7f56543fb1 | {
"head_commit": "2f0d6b72916dcc293753819e5cbfbf80f6340f9e",
"head_commit_message": "Update artifacts tests. Add reason to exception.",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20230323-133026.yaml b/.changes/unreleased/Features-20230323-133026.yaml\nnew file mode 100644\nindex 00000000000..6... | [
{
"diff_hunk": "@@ -497,6 +507,39 @@ def depends_on_nodes(self):\n def depends_on_macros(self):\n return self.depends_on.macros\n \n+ def build_contract_checksum(self):\n+ # We don't need to construct the checksum if the model does not\n+ # have contract enabled, because it won't be... | 46ad6d3ac653f9eaac0cf2c4f1fe9c585d09d117 | diff --git a/.changes/unreleased/Features-20230323-133026.yaml b/.changes/unreleased/Features-20230323-133026.yaml
new file mode 100644
index 00000000000..67e3297f7d5
--- /dev/null
+++ b/.changes/unreleased/Features-20230323-133026.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Detect breaking changes to contracts in stat... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-6713@bbb4f3c | dbt-labs/dbt-core | Python | 6,713 | CT 1894 log partial parsing var changes and sort cli vars before hashing | resolves #6710
### Description
If the order of vars passed on the command line changes, then partial parsing will be aborted. Sort the vars before hashing in order to avoid unnecessary reparsing.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBU... | 2023-01-24T19:23:36Z | [CT-1894] Add logging to improve diagnosing of unable to partial parsing because vars have changed
It's difficult to diagnose situations in which partial parsing is aborted due to changes in vars. Add logging to make it easier to determine what changed. | [
{
"body": "It's difficult to diagnose situations in which partial parsing is aborted due to changes in vars. Add logging to make it easier to determine what changed.",
"number": 6710,
"title": "[CT-1894] Add logging to improve diagnosing of unable to partial parsing because vars have changed"
}
] | 17014bfad3e204279c94c6a0285f784fc10711eb | {
"head_commit": "bbb4f3ce3f1a4492dd61b8cc01bb46549c3e7537",
"head_commit_message": "Add to test_events.py",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230124-141943.yaml b/.changes/unreleased/Fixes-20230124-141943.yaml\nnew file mode 100644\nindex 00000000000..4b85413de58\n--- /dev/null\n+++ b/... | [
{
"diff_hunk": "@@ -843,6 +843,15 @@ def message(self) -> str:\n return f\"Unable to do partial parsing because {self.reason}\"\n \n \n+@dataclass\n+class StateCheckVarsHash(DebugLevel, pt.StateCheckVarsHash):\n+ def code(self):\n+ return \"I025\"\n+\n+ def message(self) -> str:\n+ r... | b5ff7839041825213a34f777ceea0e7450358ceb | diff --git a/.changes/unreleased/Fixes-20230124-141943.yaml b/.changes/unreleased/Fixes-20230124-141943.yaml
new file mode 100644
index 00000000000..4b85413de58
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230124-141943.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Sort cli vars before hashing for partial parsing
+time: ... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-7450@9179070 | dbt-labs/dbt-core | Python | 7,450 | Use profile specified in --profile with dbt init | resolves #6154
### Description
If --profile is specified with dbt init, and the profile exists, initialize the project with that as the profile instead of creating a new profile. If the profile does not exist, or the command is run inside an existing project, it fails with an error.
### Checklist
- [X] I ha... | 2023-04-24T20:32:58Z | [CT-1418] [Bug] CLI argument `--profile` ignored in `dbt init`
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
According to `dbt init --help`, the `--profile` option le... | hi @scheah92, thanks for reporting, I am able to reproduce this. my first thought was the order of arguments, so perhaps `dbt init proj1 --profile default` would work, but that behaves the same
we are reworking our CLI commands as part of v1.4 and v1.5 and we can likely pick this up for those releases
Hi @lostmygithu... | [
{
"body": "### Is this a new bug in dbt-core?\n\n- [X] I believe this is a new bug in dbt-core\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\n\n### Current Behavior\n\nAccording to `dbt init --help`, the `--profile` option lets the user load an existing profile ... | 7c1bd91d0ae3ecea12c7f755cd0b8bb44037f319 | {
"head_commit": "9179070416b21e7fb07d7a6a5929f01d4576175a",
"head_commit_message": "Use profile specified in --profile with dbt init",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230424-161642.yaml b/.changes/unreleased/Fixes-20230424-161642.yaml\nnew file mode 100644\nindex 00000000000..aeeb8e1... | [
{
"diff_hunk": "@@ -0,0 +1,7 @@\n+kind: Fixes\n+body: If --profile specified with dbt-init, create the project with the specified\n+ profile\n+time: 2023-04-24T16:16:42.994547-04:00\n+custom:\n+ Author: ezraerb\n+ Issue: CT-1418",
"line": null,
"original_line": 7,
"original_start_line": null,
... | 9a58a15ad0d9f6b473fe0161c0a76fdb395a092f | diff --git a/.changes/unreleased/Fixes-20230424-161642.yaml b/.changes/unreleased/Fixes-20230424-161642.yaml
new file mode 100644
index 00000000000..1eae7a7bd32
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230424-161642.yaml
@@ -0,0 +1,7 @@
+kind: Fixes
+body: If --profile specified with dbt-init, create the project... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-6494@cc47f7b | dbt-labs/dbt-core | Python | 6,494 | Partial parsing bug with empty schema file - ensure None is not passed to load_yaml_text | resolves #4850
### Description
The "contents" of a file object is defined as Optional[str] but load_yaml_text does not support passing in None from contents. Ensure that if field is set to None, an empty string is passed.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs... | 2023-01-02T03:34:36Z | [CT-343] partial parse conflicts with generate_schema_name changes
### Is there an existing issue for this?
- [X] I have searched the existing issues
### Current Behavior
We have a project with a custom generate_schema_name macro.
If I change the macro generate_schema_name, project compilation fails with error `a s... | I have not been able to recreate this problem (though I don't have access to a Windows machine to test). Is there anything in the logs? Can you share your generate_schema_name macro? Could you try removing all files except the partial_parse.msgpack file from the target directory? Since the msgpack file has been loaded ... | [
{
"body": "### Is there an existing issue for this?\n\n- [X] I have searched the existing issues\n\n### Current Behavior\n\nWe have a project with a custom generate_schema_name macro.\r\nIf I change the macro generate_schema_name, project compilation fails with error `a string or stream input is required`.\r\nI... | 76fd12c7cdd3f8a0e0c921363fc1fada3eacb278 | {
"head_commit": "cc47f7b21a56ce4a05b452046236fac35e5882a0",
"head_commit_message": "Changie",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230101-223405.yaml b/.changes/unreleased/Fixes-20230101-223405.yaml\nnew file mode 100644\nindex 00000000000..d90e24aaa56\n--- /dev/null\n+++ b/.changes/unrel... | [
{
"diff_hunk": "@@ -100,8 +100,11 @@\n def yaml_from_file(source_file: SchemaSourceFile) -> Dict[str, Any]:\n \"\"\"If loading the yaml fails, raise an exception.\"\"\"\n path = source_file.path.relative_path\n+ # File contents filed is Optional, and is sometimes None, so ensure\n+ # we are not pa... | 79423cecebba0e382d65850f6be78d86f323d206 | diff --git a/.changes/unreleased/Fixes-20230101-223405.yaml b/.changes/unreleased/Fixes-20230101-223405.yaml
new file mode 100644
index 00000000000..d90e24aaa56
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230101-223405.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Bug when partial parsing with an empty schema file
+time... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-6384@1ee15a4 | dbt-labs/dbt-core | Python | 6,384 | CT 1604 remove compiled classes | resolves #6383
### Description
Remove compiled classes in order to simplify the artifact generation and code.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [x] I have signed the [CLA](https://d... | 2022-12-05T21:48:25Z | [CT-1604] Remove Compiled Node classes
As part of the structured logging updates, we are creating proto definitions for node output. Having separate "Parsed" and "Compiled" classes complicates this and also complicates the code.
Remove the core/dbt/contracts/graph/compiled.py file and references to it.
Remove "Pa... | [
{
"body": "As part of the structured logging updates, we are creating proto definitions for node output. Having separate \"Parsed\" and \"Compiled\" classes complicates this and also complicates the code.\r\n\r\nRemove the core/dbt/contracts/graph/compiled.py file and references to it.\r\n\r\nRemove \"Parsed\" ... | 16f529e1d4e067bdbb6a659a622bead442f24b4e | {
"head_commit": "1ee15a4445cd0d5870913ec59eb41bbadc6f62ce",
"head_commit_message": "Initial pass at renaming Parsed nodes",
"patch_to_review": "diff --git a/.changes/unreleased/Under the Hood-20221205-164948.yaml b/.changes/unreleased/Under the Hood-20221205-164948.yaml\nnew file mode 100644\nindex 00000000000..... | [
{
"diff_hunk": "@@ -243,20 +242,19 @@ def create_from_node(\n def create_from(\n cls: Type[Self],\n config: HasQuoting,\n- node: Union[CompiledNode, ParsedNode, ParsedSourceDefinition],\n+ node: Union[ParsedNode, SourceDefinition],\n **kwargs: Any,\n ) -> Self:\n ... | 92e97e5bf25058d256ce3bb61e0960bf619844b9 | diff --git a/.changes/unreleased/Under the Hood-20221205-164948.yaml b/.changes/unreleased/Under the Hood-20221205-164948.yaml
new file mode 100644
index 00000000000..579f973955b
--- /dev/null
+++ b/.changes/unreleased/Under the Hood-20221205-164948.yaml
@@ -0,0 +1,7 @@
+kind: Under the Hood
+body: Consolidate ParsedN... | {
"difficulty": "low",
"estimated_review_effort": 3,
"problem_domain": "Code Refactoring / Architectural Improvement"
} | |
dbt-labs__dbt-core-6317@16525a1 | dbt-labs/dbt-core | Python | 6,317 | Fix dbt.config.get default values (python-model) | resolves #6309
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
-->
### Description
After this, will be possible to use default values for dbt.config.get
... | 2022-11-24T18:13:42Z | [CT-1545] [Bug] dbt.config.get returns Undefined instead of the default value in Python model
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
`dbt.config.get("mi... | Related to https://github.com/dbt-labs/dbt-core/issues/5846. I can work in a PR to fix that.
@devmessias Good catch, thanks for opening!
This feels like a relatively simple & self-contained fix, so we'd welcome a contribution for it. Let us know if it turns out to be trickier than expected.
> @devmessias Good catch,... | [
{
"body": "### Is this a new bug in dbt-core?\r\n\r\n- [X] I believe this is a new bug in dbt-core\r\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\r\n\r\n### Current Behavior\r\n\r\n`dbt.config.get(\"missing_key\", \"default_value\")` default value dosen't work.... | 7d7066466db4aa34ec89f4f75d039f57b65fbf1e | {
"head_commit": "16525a1f06a913ee12e104f7dce931c8b697a5bf",
"head_commit_message": "docs: changie yaml",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20221124-163419.yaml b/.changes/unreleased/Fixes-20221124-163419.yaml\nnew file mode 100644\nindex 00000000000..010a073269a\n--- /dev/null\n+++ b/.ch... | [
{
"diff_hunk": "@@ -207,15 +207,33 @@ def parse_python_model(self, node, config, context):\n dbtParser = PythonParseVisitor(node)\n dbtParser.visit(tree)\n config_keys_used = []\n+ config_keys_defaults = []\n for (func, args, kwargs) in dbtParser.dbt_function_calls:\n ... | c220c0f69fc5e97bc1548ea98386aea38063ec8a | diff --git a/.changes/unreleased/Fixes-20221124-163419.yaml b/.changes/unreleased/Fixes-20221124-163419.yaml
new file mode 100644
index 00000000000..010a073269a
--- /dev/null
+++ b/.changes/unreleased/Fixes-20221124-163419.yaml
@@ -0,0 +1,7 @@
+kind: Fixes
+body: After this, will be possible to use default values for d... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-7186@c6b5b12 | dbt-labs/dbt-core | Python | 7,186 | Support configurable delimiter for seed files, default to comma (#3990) | resolves #3990
### Original description
Added support to configure a custom delimiter for seed files, defaults to comma.
### Copilot description
This pull request introduces several changes related to seed files and configuration options. The most important changes include adding new test classes and methods to... | 2023-03-17T13:52:45Z | Introduce "delimiter" parameter for seeds? Allow non-csv file types
### Describe the feature
Use alternative delimiters for seeds besides "," (comma)
### Describe alternatives you've considered
Currently, the only option is to load a non-csv seed into database as a temp table and then reference that as a "source".... | @sgoley When you say "non-csv file types," are you talking only about tabular data with non-comma delimiters (e.g. TSVs)? Or are you also thinking about other formats for structured data (JSON, XML, ...)?
If it's just a question of delimiters, could you provide a bit more background on the difficulty you're encounte... | [
{
"body": "### Describe the feature\r\nUse alternative delimiters for seeds besides \",\" (comma)\r\n\r\n### Describe alternatives you've considered\r\nCurrently, the only option is to load a non-csv seed into database as a temp table and then reference that as a \"source\".\r\n\r\n### Additional context\r\nNo,... | 7872f6a67087b08e377cb580248a70355c6c3c76 | {
"head_commit": "c6b5b12daffdd555a15c09358a9b933a87eac0dd",
"head_commit_message": "Update Features-20230317-144957.yaml",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20230317-144957.yaml b/.changes/unreleased/Features-20230317-144957.yaml\nnew file mode 100644\nindex 00000000000..f00c52795c9\n... | [
{
"diff_hunk": "@@ -435,6 +435,7 @@ class NodeConfig(NodeAndTestConfig):\n default_factory=dict,\n metadata=MergeBehavior.Update.meta(),\n )\n+ delimiter: str = \",\"",
"line": null,
"original_line": 438,
"original_start_line": null,
"path": "core/dbt/contracts/graph/model... | 847eb2d6cd0c1ca3890712d490a9c863bfc1e6c9 | diff --git a/.changes/unreleased/Features-20230714-202445.yaml b/.changes/unreleased/Features-20230714-202445.yaml
new file mode 100644
index 00000000000..c72dfb0e8ea
--- /dev/null
+++ b/.changes/unreleased/Features-20230714-202445.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: Added support to configure a delimiter for a... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-6064@c1152e2 | dbt-labs/dbt-core | Python | 6,064 | Convert messages to struct logs | resolves #5957
### Description
Convert msg to be built in struct logs
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license... | 2022-10-14T14:01:15Z | [CT-1267] Convert non-structured messages generated in exceptions.py to structured events
We have a number of logging events in which the string message is generated by external utilities, mostly in various functions in exceptions.py. Because of this, the actual information used to structure the message is not include... | [
{
"body": "We have a number of logging events in which the string message is generated by external utilities, mostly in various functions in exceptions.py. Because of this, the actual information used to structure the message is not included in the logging event. These events can be identified by the fact that... | 8145eed603266951ce35858f7eef3836012090bd | {
"head_commit": "c1152e23e48bfb2a4442a152a26612d7e5278c66",
"head_commit_message": "fix expected test message",
"patch_to_review": "diff --git a/core/dbt/adapters/base/impl.py b/core/dbt/adapters/base/impl.py\nindex 3c301c2e7f4..33b7c45a3c4 100644\n--- a/core/dbt/adapters/base/impl.py\n+++ b/core/dbt/adapters/ba... | [
{
"diff_hunk": "@@ -16,17 +16,16 @@\n from dbt.contracts.connection import AdapterRequiredConfig, Credentials\n from dbt.contracts.graph.manifest import ManifestMetadata\n from dbt.contracts.relation import ComponentName\n-from dbt.ui import warning_tag\n \n from dbt.contracts.project import Configuration, User... | 64cc12d0deb07204c471416666ba0e9ec20fc80c | diff --git a/core/dbt/adapters/base/impl.py b/core/dbt/adapters/base/impl.py
index 3c301c2e7f4..33b7c45a3c4 100644
--- a/core/dbt/adapters/base/impl.py
+++ b/core/dbt/adapters/base/impl.py
@@ -41,13 +41,13 @@
from dbt.contracts.graph.compiled import CompileResultNode, CompiledSeedNode
from dbt.contracts.graph.manifes... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Code Refactoring / Architectural Improvement"
} | |
dbt-labs__dbt-core-6022@0757fa0 | dbt-labs/dbt-core | Python | 6,022 | Generate API docs | resolves #5528
### Description
Allows for the auto generation of docs for the high level CLI API. This does not also generate those docs via Github Actions, only enables their generation.
### Checklist
- [X] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md)... | 2022-10-07T14:06:03Z | [CT-902] CLI (Top level API) is automatically documented
**User Story:**
As a user I would like to have accurate and easy to read documentation for how to use `dbt-core` as a library.
**Acceptance Criteria:**
An auto-documentation product (probably Sphinx) is set up and documents the top-level api. This runs as a... | Let's make sure we account for accurate help text for commands which is referenced in this issue:
https://github.com/dbt-labs/dbt-core/issues/5319
FYI-- I think there's been some confusion vis-a-vis the documentation. This ticket is to generate sphinx docs as a reference, it doesn't refer to help text at all.
That... | [
{
"body": "**User Story:**\r\nAs a user I would like to have accurate and easy to read documentation for how to use `dbt-core` as a library.\r\n\r\n**Acceptance Criteria:**\r\nAn auto-documentation product (probably Sphinx) is set up and documents the top-level api. This runs as a GHA.",
"number": 5528,
... | 95ad1ca4f89f422022e96af547dcd4aa5f288232 | {
"head_commit": "0757fa08badf76f3abd3cefb87849a9c5053f757",
"head_commit_message": "Add changie entry",
"patch_to_review": "diff --git a/.changes/unreleased/Docs-20221007-090656.yaml b/.changes/unreleased/Docs-20221007-090656.yaml\nnew file mode 100644\nindex 00000000000..1159879a249\n--- /dev/null\n+++ b/.chang... | [
{
"diff_hunk": "@@ -0,0 +1,5 @@\n+dbt-core\n+=======\n+\n+**dbt-core** An ELT tool for managing your SQL transformations and data models.",
"line": null,
"original_line": 4,
"original_start_line": null,
"path": "core/dbt/docs/README.rst",
"start_line": null,
"text": "@user1:\nJust for un... | 437732be39c42c218910115776469c50197f4dd8 | diff --git a/.changes/unreleased/Docs-20221007-090656.yaml b/.changes/unreleased/Docs-20221007-090656.yaml
new file mode 100644
index 00000000000..1159879a249
--- /dev/null
+++ b/.changes/unreleased/Docs-20221007-090656.yaml
@@ -0,0 +1,7 @@
+kind: Docs
+body: Generate API docs for new CLI interface
+time: 2022-10-07T09... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Documentation Updates"
} |
dbt-labs__dbt-core-5873@ab34ec2 | dbt-labs/dbt-core | Python | 5,873 | Adding metric expression validation | resolves #5871
### Description
- changing default value for expression to None
- Adding test to confirm behavior
### Checklist
- [X] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [X] I have signed the [CLA](http... | 2022-09-16T20:46:08Z | [CT-1201] [Bug] Metrics don't require `expression` field
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
Ran into this behavior when working with a beta customer... | Thanks for the quick issue + PR Callum! | [
{
"body": "### Is this a new bug in dbt-core?\r\n\r\n- [X] I believe this is a new bug in dbt-core\r\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\r\n\r\n### Current Behavior\r\n\r\nRan into this behavior when working with a beta customer. Right now, we provide ... | f5a94fc77428426002ef2a908ebf57a32597a627 | {
"head_commit": "ab34ec2de46bfd6b7a0a2345149c2fe34e74429b",
"head_commit_message": "updating for review",
"patch_to_review": "diff --git a/.changes/unreleased/Under the Hood-20220916-154712.yaml b/.changes/unreleased/Under the Hood-20220916-154712.yaml\nnew file mode 100644\nindex 00000000000..1d425067d3e\n--- /... | [
{
"diff_hunk": "@@ -196,6 +196,42 @@ def test_simple_metric(\n run_dbt([\"run\"])\n \n \n+invalid_metrics__missing_expression_yml = \"\"\"\n+version: 2\n+metrics:\n+ - name: number_of_people\n+ label: \"Number of people\"\n+ description: Total count of people\n+ calculation_method: count\n... | 50938067d42677e2190ea4cc596d85ddc6565524 | diff --git a/.changes/unreleased/Under the Hood-20220916-154712.yaml b/.changes/unreleased/Under the Hood-20220916-154712.yaml
new file mode 100644
index 00000000000..1d425067d3e
--- /dev/null
+++ b/.changes/unreleased/Under the Hood-20220916-154712.yaml
@@ -0,0 +1,7 @@
+kind: Under the Hood
+body: Adding validation f... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-5895@8ea776d | dbt-labs/dbt-core | Python | 5,895 | improve error message for parsing args | resolves #5887
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
-->
### Description
Adding more clear error message for parsing error in dbt python model, this... | 2022-09-20T21:58:32Z | [CT-1215] [Bug] support indirect strings in `ref` and `source` for Python models
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
**EDIT**: see comment below. thi... | this is a bit complicated -- even this would fail:
```python
def model(dbt, session):
model_name = "orders"
return dbt.ref(model_name)
```
intermediate step could be more clear error message | [
{
"body": "### Is this a new bug in dbt-core?\r\n\r\n- [X] I believe this is a new bug in dbt-core\r\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\r\n\r\n### Current Behavior\r\n\r\n**EDIT**: see comment below. this does not fail due to iterables/lists/dictionar... | ae294b643be3b825865a4ce3ff9fe47b523256c6 | {
"head_commit": "8ea776dd168aa830408cc70c12e2171ff76402ef",
"head_commit_message": "update error message",
"patch_to_review": "diff --git a/core/dbt/main.py b/core/dbt/main.py\nindex 0770a41ca8b..d708e5bd050 100644\n--- a/core/dbt/main.py\n+++ b/core/dbt/main.py\n@@ -1,4 +1,5 @@\n from typing import List\n+\n fr... | [
{
"diff_hunk": "@@ -143,7 +149,8 @@ def main(args=None):\n \n except BaseException as e:\n fire_event(MainEncounteredError(exc=str(e)))\n- fire_event(MainStackTrace(stack_trace=traceback.format_exc()))\n+ if not isinstance(e, ParsingException):",
"line": null,
"... | 4e35379e854b305925d1afa6545fc23c5e78e00d | diff --git a/core/dbt/main.py b/core/dbt/main.py
index 0770a41ca8b..a7a3b3247bd 100644
--- a/core/dbt/main.py
+++ b/core/dbt/main.py
@@ -1,4 +1,5 @@
from typing import List
+
from dbt.logger import log_cache_events, log_manager
import argparse
@@ -43,7 +44,12 @@
from dbt.utils import ExitCodes, args_to_dict
fr... | {
"difficulty": "low",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-6172@e3a8da4 | dbt-labs/dbt-core | Python | 6,172 | CT 1443 remove root path | resolves #6171
### Description
As part of cleanup for the structured logging effort, remove the 'root_path' field from most nodes.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [x] I have sig... | 2022-10-28T14:47:44Z | [CT-1443] Remove 'root_path' from most node definitions
We are moving towards enabling manifests to be portable. Currently we include the 'root_path' of the project in every node, which is duplicative and non-portable. In addition, this field is hardly used.
Remove root_path from the node class definitions.
Note:... | [
{
"body": "We are moving towards enabling manifests to be portable. Currently we include the 'root_path' of the project in every node, which is duplicative and non-portable. In addition, this field is hardly used.\r\n\r\nRemove root_path from the node class definitions.\r\n\r\nNote: because we don't load seed c... | 68d06d8a9cea28600ed9c3f375605c9467247316 | {
"head_commit": "e3a8da49e3f33f7c3ce71d387d4f7fe7fa96118d",
"head_commit_message": "Changie",
"patch_to_review": "diff --git a/.changes/unreleased/Under the Hood-20221028-104837.yaml b/.changes/unreleased/Under the Hood-20221028-104837.yaml\nnew file mode 100644\nindex 00000000000..22ad4901794\n--- /dev/null\n++... | [
{
"diff_hunk": "@@ -366,9 +365,6 @@\n \"package_name\": {\n \"type\": \"string\"\n },\n- \"root_path\": {\n- \"type\": \"string\"\n- },",
"line": null,
"original_line": 371,
"original_start_line": 369,
"path": "schemas/dbt/manifest/v7.json",
"... | d83c734f1e2abee82489c0b670039929b4cb86e4 | diff --git a/.changes/unreleased/Under the Hood-20221028-104837.yaml b/.changes/unreleased/Under the Hood-20221028-104837.yaml
new file mode 100644
index 00000000000..22ad4901794
--- /dev/null
+++ b/.changes/unreleased/Under the Hood-20221028-104837.yaml
@@ -0,0 +1,7 @@
+kind: Under the Hood
+body: Remove the 'root_pa... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Code Refactoring / Architectural Improvement"
} | |
dbt-labs__dbt-core-5868@931c603 | dbt-labs/dbt-core | Python | 5,868 | Disabled Models in schema files | resolves #3992
### Description
- throw correct exception for models disabled in schema files
- fix bug when chained disabled models incorrectly throw exception
- Add tests
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understan... | 2022-09-16T15:33:54Z | [CT-232] Setting enabled to False in schema config does not move model to disabled
In the model node, NodeConfig.enabled equals False, but because the node isn't moved into the disabled dictionary, it doesn't have the correct error messages. Instead of the node is disabled messages, nodes referring to the disabled node... | In addition, I don't think we ever remove models from 'disabled', which didn't matter that much without partial parsing, but probably should be fixed.
And a model that starts out 'disabled' can now be subsequently enabled via patch config, so we need to apply patches to disabled nodes and put them in the right place.
... | [
{
"body": "In the model node, NodeConfig.enabled equals False, but because the node isn't moved into the disabled dictionary, it doesn't have the correct error messages. Instead of the node is disabled messages, nodes referring to the disabled node cause an error \"Model ... depends on a node named ... which wa... | 8129862b3c0080215cae2748d54354649a6f8abe | {
"head_commit": "931c603267b9b2547a0e04a45bd3cb82f07a1739",
"head_commit_message": "remove comments",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20220916-104854.yaml b/.changes/unreleased/Fixes-20220916-104854.yaml\nnew file mode 100644\nindex 00000000000..64e76c43a3f\n--- /dev/null\n+++ b/.chang... | [
{
"diff_hunk": "@@ -885,11 +888,20 @@ def parse_patch(self, block: TargetBlock[NodeTarget], refs: ParserRef) -> None:\n # Node might be disabled. Following call returns list of matching disabled nodes\n found_nodes = self.manifest.disabled_lookup.find(patch.name, patch.package_name)\n ... | 78c58af37e60f97a4e1886ec0e2aeb45c7d0e20a | diff --git a/.changes/unreleased/Fixes-20220916-104854.yaml b/.changes/unreleased/Fixes-20220916-104854.yaml
new file mode 100644
index 00000000000..64e76c43a3f
--- /dev/null
+++ b/.changes/unreleased/Fixes-20220916-104854.yaml
@@ -0,0 +1,7 @@
+kind: Fixes
+body: Account for disabled flags on models in schema files mor... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-5859@166fb1d | dbt-labs/dbt-core | Python | 5,859 | feature/favor-state-node | resolves #5016
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
-->
### Description
<!---
Describe the Pull Request here. Add any references and info to ... | 2022-09-16T13:25:09Z | [CT-470] [Feature] Add option for --defer to favor using --state node even if node exists in current target
### Is there an existing feature request for this?
- [X] I have searched the existing issues
### Describe the Feature
This is the current behaviour of the `--defer` flag:
> When the --defer flag is provided... | PR [here](https://github.com/dbt-labs/dbt-core/pull/5017) of the proposed changes
Hi @daniel-murray, thanks so much for the contribution! I'll give this PR a review shortly, but in the meantime can you please fill out [our CLA](https://docs.getdbt.com/docs/contributing/contributor-license-agreements) so we can get thi... | [
{
"body": "### Is there an existing feature request for this?\n\n- [X] I have searched the existing issues\n\n### Describe the Feature\n\nThis is the current behaviour of the `--defer` flag:\r\n\r\n> When the --defer flag is provided, dbt will resolve ref calls differently depending on two criteria:\r\n> Is the... | fa4f9d3d97dd3207720867cb3b493bea3ca58a42 | {
"head_commit": "166fb1d6f538fdb846d71e410e50e646e8d388f7",
"head_commit_message": "Update test/integration/062_defer_state_tests/test_defer_state.py\n\nCo-authored-by: Stu Kilgore <stuart.kilgore@gmail.com>",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20220408-165459.yaml b/.changes/unrelease... | [
{
"diff_hunk": "@@ -169,6 +235,23 @@ def run_defer_iff_not_exists(self):\n assert self.other_schema not in results[0].node.compiled_code\n assert self.unique_schema() in results[0].node.compiled_code\n \n+ def run_defer_iff_not_exists_favor_state(self):\n+ results = self.run_dbt(['seed... | e428cd0ece88930533c193c7ea4a231aec795735 | diff --git a/.changes/unreleased/Features-20220408-165459.yaml b/.changes/unreleased/Features-20220408-165459.yaml
new file mode 100644
index 00000000000..c29cfc617c7
--- /dev/null
+++ b/.changes/unreleased/Features-20220408-165459.yaml
@@ -0,0 +1,8 @@
+kind: Features
+body: Added favor-state flag to optionally favor s... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-5789@54f198c | dbt-labs/dbt-core | Python | 5,789 | Complete CLI modeling for Click | resolves #5526
### Description
New Click CLI that models the existing cli
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-licens... | 2022-09-08T15:50:07Z | [CT-900] Complete CLI modeling (Top level API)
**User story:**
As developer of dbt or a developer who would like to use dbt as a library, I would like to have an easily usable interface that models the user interactions at the CLI level (`dbt compile`, `dbt run`, etc).
**Acceptance Criteria:**
Extending the work d... | [
{
"body": "**User story:**\r\nAs developer of dbt or a developer who would like to use dbt as a library, I would like to have an easily usable interface that models the user interactions at the CLI level (`dbt compile`, `dbt run`, etc).\r\n\r\n**Acceptance Criteria:**\r\nExtending the work done in the RAT, `dbt... | e3452b9a8feeb89cc449f1bbc9109f03e7e52bf4 | {
"head_commit": "54f198c8aea2ed35291933d6a26d7638e1b15bda",
"head_commit_message": "changelog",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20220908-104149.yaml b/.changes/unreleased/Features-20220908-104149.yaml\nnew file mode 100644\nindex 00000000000..c975dfb1446\n--- /dev/null\n+++ b/.chang... | [
{
"diff_hunk": "@@ -43,9 +43,7 @@\n include_package_data=True,\n test_suite=\"test\",\n entry_points={\n- \"console_scripts\": [\n- \"dbt = dbt.main:main\",\n- ],\n+ \"console_scripts\": [\"dbt = dbt.main:main\", \"dbt-cli = dbt.cli.main:cli\"],",
"line": null,
... | 87a56acff10fd712f5c8d1e594175a9059260632 | diff --git a/.changes/unreleased/Features-20220908-104149.yaml b/.changes/unreleased/Features-20220908-104149.yaml
new file mode 100644
index 00000000000..c975dfb1446
--- /dev/null
+++ b/.changes/unreleased/Features-20220908-104149.yaml
@@ -0,0 +1,7 @@
+kind: Features
+body: Adds new cli framework
+time: 2022-09-08T10:... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-5292@9f27907 | dbt-labs/dbt-core | Python | 5,292 | Fix postgres handling for unlimited varchars | resolves #5238
### Description
Handles `varchar` the same way as `text` for postgres columns (since unlimited `varchar` on postgres is not implicitely limited to 256 characters as on redshift)
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTI... | 2022-05-23T08:38:23Z | [CT-636] [Bug] Postgres unlimited varchar default to varchar(256)
### Is there an existing issue for this?
- [X] I have searched the existing issues
### Current Behavior
When using postgres adapter with some varchar typed columns (like when using dbt_utils.type_string()), if you use incremental materialization... | > Just wondered if this shall be fixed in the PostgresColumn class (that already handles text columns this way), or if we shall just update the dbt_utils.string_type macro to use text instead of varchar for postgres
Yes! Very relevant: https://github.com/dbt-labs/dbt-utils/pull/586
Seems really nice !
If i underst... | [
{
"body": "### Is there an existing issue for this?\r\n\r\n- [X] I have searched the existing issues\r\n\r\n### Current Behavior\r\n\r\nWhen using postgres adapter with some varchar typed columns (like when using dbt_utils.type_string()), if you use incremental materialization with sync_new_columns or append_ne... | aeee1c23a6826aa1d254a939655cb514f38db649 | {
"head_commit": "9f2790798549e0143d542ae2d81cf3623f47e4ee",
"head_commit_message": "chore: added changelog entry",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20220523-103843.yaml b/.changes/unreleased/Fixes-20220523-103843.yaml\nnew file mode 100644\nindex 00000000000..1235865763c\n--- /dev/null\... | [
{
"diff_hunk": "@@ -0,0 +1,8 @@\n+kind: Fixes\n+body: Remove the default 256 characters limit on postgres character varying type when\n+ no limitation is set\n+time: 2022-05-23T10:38:43.392232+02:00\n+custom:\n+ Author: shrodingers\n+ Issue: \"636\"",
"line": null,
"original_line": 7,
"original_s... | d1b75289595b95f3ac2055b19b7ba5b9e11c9acf | diff --git a/.changes/unreleased/Fixes-20220523-103843.yaml b/.changes/unreleased/Fixes-20220523-103843.yaml
new file mode 100644
index 00000000000..15a2342d7d8
--- /dev/null
+++ b/.changes/unreleased/Fixes-20220523-103843.yaml
@@ -0,0 +1,8 @@
+kind: Fixes
+body: Remove the default 256 characters limit on postgres char... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-4587@19ded66 | dbt-labs/dbt-core | Python | 4,587 | Clarify "incompatible package version" error msg | resolves #4586
### Description
Gives an actionable error message when a package isn’t compatible with the current version of dbt core.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [ ] I have run this code in development and it appears to resolve ... | 2022-01-19T00:16:15Z | [CT-57] [Feature] Clarify what to do when getting a version incompatibility error
### Is there an existing feature request for this?
- [X] I have searched the existing issues
### Describe the Feature
When trying to run dbt with a package that's incompatible due to require-dbt-version, the error message says "Check t... | [
{
"body": "### Is there an existing feature request for this?\n\n- [X] I have searched the existing issues\n\n### Describe the Feature\n\nWhen trying to run dbt with a package that's incompatible due to require-dbt-version, the error message says \"Check the requirements for the 'dbt_utils' package, or run dbt ... | 5aeb088a732d280c7e5211780e2ea44a01a4760d | {
"head_commit": "19ded66eb95025af94efd5d035ac60d24682e83c",
"head_commit_message": "Clarify \"incompatible package version\" error msg",
"patch_to_review": "diff --git a/core/dbt/config/project.py b/core/dbt/config/project.py\nindex e343d5c860c..8f4a931522c 100644\n--- a/core/dbt/config/project.py\n+++ b/core/db... | [
{
"diff_hunk": "@@ -45,7 +45,7 @@\n This version of dbt is not supported with the '{package}' package.\n Installed version of dbt: {installed}\n Required version of dbt for '{package}': {version_spec}\n-Check the requirements for the '{package}' package, or run dbt again with \\\n+Check for an updated versi... | 7784ebd4a6482b07882a76fdf672663ed7df84c2 | diff --git a/core/dbt/config/project.py b/core/dbt/config/project.py
index e343d5c860c..46a09d0338a 100644
--- a/core/dbt/config/project.py
+++ b/core/dbt/config/project.py
@@ -45,7 +45,7 @@
This version of dbt is not supported with the '{package}' package.
Installed version of dbt: {installed}
Required version ... | {
"difficulty": "low",
"estimated_review_effort": 1,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-4986@7e9cd5b | dbt-labs/dbt-core | Python | 4,986 | Remove TableComparison and convert existing calls to use dbt.tests.util |
resolves #4778
### Description
Remove TableComparison and the dbt.test.tables file. Replace existing calls to TableComparison to functions in dbt.tests.util which were converted from dbt-adapter-tests. Add some comments.
I fixed a commented out assert in the dbt_run function, and had to update a bunch of te... | 2022-04-01T19:46:15Z | [CT-281] Make obsolete the test compare tables code now in core/dbt/tests/tables.py
As part of the conversion to switching from unittest to pytest, the code in test/integration/base.py that implements the five table comparison assertions was pulled into a separate file, core/dbt/tests/tables.py. There are better ways ... | In particular, there's a lot of overlap between what's in [`tables.py`](https://github.com/dbt-labs/dbt-core/blob/main/core/dbt/tests/tables.py), and what's been implemented to power the (relatively newer) suite of basic adapter tests [here](https://github.com/dbt-labs/dbt-core/blob/ea5a9da71ef71cc13414cd8c2f8097448add... | [
{
"body": "As part of the conversion to switching from unittest to pytest, the code in test/integration/base.py that implements the five table comparison assertions was pulled into a separate file, core/dbt/tests/tables.py. There are better ways to do this, including using macros and data tests. \n\nImplement ... | 7f953a6d48a4db254b17fd3929d267e4b6069228 | {
"head_commit": "7e9cd5b1e32838df82628b8ac05b4df3523c9f25",
"head_commit_message": "Minor cleanup",
"patch_to_review": "diff --git a/.changes/unreleased/Under the Hood-20220401-154729.yaml b/.changes/unreleased/Under the Hood-20220401-154729.yaml\nnew file mode 100644\nindex 00000000000..6556d742b0b\n--- /dev/nu... | [
{
"diff_hunk": "@@ -311,17 +375,47 @@ def generate_update_clause(adapter, clause) -> str:\n raise TestProcessingException(\"Invalid update_rows clause: no src_col\")\n add_to = clause[\"src_col\"]\n kwargs = {k: v for k, v in clause.items() if k in (\"interval\", \"number\")}\n- ... | eaf7a2cf99de132940436de521394cc18428a41f | diff --git a/.changes/unreleased/Under the Hood-20220401-154729.yaml b/.changes/unreleased/Under the Hood-20220401-154729.yaml
new file mode 100644
index 00000000000..6556d742b0b
--- /dev/null
+++ b/.changes/unreleased/Under the Hood-20220401-154729.yaml
@@ -0,0 +1,7 @@
+kind: Under the Hood
+body: Remove TableCompari... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Code Refactoring / Architectural Improvement"
} |
dbt-labs__dbt-core-3724@c6f05cc | dbt-labs/dbt-core | Python | 3,724 | Combine integration test workflows | - Combines the integration test workflows from #3669
- splits up unit tests and code linting so it is clear what each workflow is responsible for
This PR builds on top of #3669. In #3669 there are two workflows for integration tests, one for PRs and one for pushes to release branches (so after merging PRs). I don't... | 2021-08-11T13:18:10Z | Move CI to GitHub Actions
see title 😄
- helpful for all of CI to be located in one place
- logs and artifacts are easily accessible for the same UI the codebase lives in
- noticeable increase in speed
- ability to control concurrency if we notice parallel test runs overloading sandbox warehouses
- a safer way ... | [
{
"body": "see title 😄 \r\n\r\n- helpful for all of CI to be located in one place\r\n- logs and artifacts are easily accessible for the same UI the codebase lives in\r\n- noticeable increase in speed\r\n- ability to control concurrency if we notice parallel test runs overloading sandbox warehouses\r\n- a safer... | b2348a905d526c15110fe459446f6c8f9934a44b | {
"head_commit": "c6f05cc562c8f154213d3fccecc294c30a6e8a0a",
"head_commit_message": "split up lint and unit workflows for clear resposibilites",
"patch_to_review": "diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml\nindex 46c82e1b195..5707dfc743b 100644\n--- a/.github/workflows/build.yml\n+++... | [
{
"diff_hunk": "@@ -17,32 +22,30 @@ on:\n - \"*.latest\"\n - \"releases/*\"\n pull_request:\n+ branches-ignore:",
"line": null,
"original_line": 25,
"original_start_line": null,
"path": ".github/workflows/unit.yml",
"start_line": null,
"text": "@user1:\nDo we have unit t... | 25f430215f480fd4c341579139f7502dbb229128 | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46c82e1b195..e9862d7de58 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,10 +1,15 @@
-# **what?** - This workflow builds python packages and ensures they can be
+# **what?**
+# This workflow builds python packa... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Test Suite / CI Enhancements"
} | |
dbt-labs__dbt-core-4017@98de45b | dbt-labs/dbt-core | Python | 4,017 | Smart Reruns from Failures/Errors | resolves #3891
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Example:
resolves #1234
-->
### Description
<!--- Describe the Pull Request here --... | 2021-10-06T21:46:30Z | Checkpointing in dbt
### Describe the feature
A checkpointing mechanism that can be used to start from a failure point when running a `dbt run` statement.
### Describe alternatives you've considered
As I'm running `dbt run` via cli, I'm using some shell/python scripts to create a checkpoint file (a txt file with t... | @fclesio Agree big-time!
The way I've been thinking about this: dbt should be able to read the artifact from a prior run (namely `run_results.json`), and select all nodes with a certain [status](https://schemas.getdbt.com/dbt/run-results/v2/index.html#tab-pane_results_items_status_oneOf_i0). That could look like `db... | [
{
"body": "### Describe the feature\r\nA checkpointing mechanism that can be used to start from a failure point when running a `dbt run` statement.\r\n\r\n### Describe alternatives you've considered\r\nAs I'm running `dbt run` via cli, I'm using some shell/python scripts to create a checkpoint file (a txt file ... | 5f483a6b136231f49b23ab2889463d88f563dd4d | {
"head_commit": "98de45bebc5466a7fadad36d77fe9d4d969d5884",
"head_commit_message": "Update changelog",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex bfa5948e5f6..fd562f339ff 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,8 +1,15 @@\n ## dbt-core 1.0.0 (Release TBD)\n \n-## dbt-core 1... | [
{
"diff_hunk": "@@ -0,0 +1,436 @@\n+from test.integration.base import DBTIntegrationTest, use_profile\n+import os\n+import random\n+import shutil\n+import string\n+\n+import pytest\n+\n+from dbt.exceptions import CompilationException\n+\n+\n+class TestRunResultsState(DBTIntegrationTest):\n+ @property\n+ d... | 0250e4f13d1e673b59dcafd54d362dab0eb47538 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 385c8771bc8..dd21b3598f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,22 @@
## dbt-core 1.0.0 (Release TBD)
### Breaking changes
+
- Enable `on-run-start` and `on-run-end` hooks for `dbt test`. Add `flags.WHICH` to execution context, representing current t... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-5395@a1d75c1 | dbt-labs/dbt-core | Python | 5,395 | Fix/incremental column precision changes | resolves #5351
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
-->
### Description
<!---
Describe the Pull Request here. Add any references and info to h... | 2022-06-18T02:37:26Z | [CT-736] [CT-735] varchar column reduces in size on an incremental run which leads to "Value too long for character type" error
### Describe the bug
I have an incremental model with the following properties:
```
materialized="incremental",
sort="date_col",
dist="date_col",
unique_key="user_id_date",
incremen... | @stnguyen Thanks for opening!
It sounds like `on_schema_change` logic [here](https://github.com/dbt-labs/dbt-core/blob/72b6a80b07b3acc9aa64ae65c5d82191dbb1aa11/core/dbt/include/global_project/macros/materializations/models/incremental/on_schema_change.sql#L79-L85), or more likely the logic in [`diff_column_data_type... | [
{
"body": "### Describe the bug\r\n\r\nI have an incremental model with the following properties:\r\n\r\n```\r\nmaterialized=\"incremental\",\r\nsort=\"date_col\",\r\ndist=\"date_col\",\r\nunique_key=\"user_id_date\",\r\nincremental_strategy=\"merge\",\r\non_schema_change=\"sync_all_columns\"\r\n```\r\n\r\nThe ... | a3b018fd3b0c789c976e0e189788471edef8acb1 | {
"head_commit": "a1d75c1adb112281619527e9736e597db7815eb2",
"head_commit_message": "Move test from integration to adapter tests",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20220617-193731.yaml b/.changes/unreleased/Fixes-20220617-193731.yaml\nnew file mode 100644\nindex 00000000000..dc52163d3f3\... | [
{
"diff_hunk": "@@ -58,5 +60,30 @@ def test_incremental(self, project):\n assert len(catalog.sources) == 1\n \n \n+class BaseIncrementalNotSchemaChange:\n+ @pytest.fixture(scope=\"class\")\n+ def project_config_update(self):\n+ return {\"name\": \"incremental\"}\n+\n+ @pytest.fixture(sco... | 74af5b0201fc009cd275071aa270767358e4e91c | diff --git a/.changes/unreleased/Fixes-20220617-193731.yaml b/.changes/unreleased/Fixes-20220617-193731.yaml
new file mode 100644
index 00000000000..dc52163d3f3
--- /dev/null
+++ b/.changes/unreleased/Fixes-20220617-193731.yaml
@@ -0,0 +1,7 @@
+kind: Fixes
+body: 'Resolves #5351 - Do not consider shorter varchar cols a... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-3729@5c6a5f6 | dbt-labs/dbt-core | Python | 3,729 | Retry GitHub download failures | resolves https://github.com/dbt-labs/dbt/issues/3546
### Description
We are seeing `dbt deps` fail intermittently when trying to reach out to GitHub. We do retry logic for when we reach out to the registry hub so we want to try the same retry logic for GitHub to see if it improves the success rate of `dbt deps`.
... | 2021-08-11T15:54:55Z | Detect GitHub network errors and provide a clean error that defines that a bad response came from GitHub
### Describe the feature
When running `dbt deps`, we found multiple users coming across different error states:
* tarfile.ReadError: file could not be opened successfully
* 2021-06-28 17:02:01.465062 (MainThread)... | Thanks for opening @heysweet!
This was cropping up in the `install` method of `dbt deps`. We failed to download the tar package, so when it came time to unpack ("untar") it, there was no tar there:
https://github.com/dbt-labs/dbt/blob/f460d275baa4df8cf8713f27e198a3577d6ea71c/core/dbt/deps/registry.py#L63-L67
P... | [
{
"body": "### Describe the feature\r\nWhen running `dbt deps`, we found multiple users coming across different error states:\r\n* tarfile.ReadError: file could not be opened successfully\r\n* 2021-06-28 17:02:01.465062 (MainThread): STDOUT: \"b''\"\r\n2021-06-28 17:02:01.465389 (MainThread): STDERR: \"b\"fatal... | 1a984601ee964fff59e338805ab49a1e8489e342 | {
"head_commit": "5c6a5f6cc167aad2708d1db4315a05cbf20a494e",
"head_commit_message": "Fixed linting and added comment",
"patch_to_review": "diff --git a/core/dbt/clients/registry.py b/core/dbt/clients/registry.py\nindex 30b2c9020e6..78e569a8a3a 100644\n--- a/core/dbt/clients/registry.py\n+++ b/core/dbt/clients/reg... | [
{
"diff_hunk": "@@ -0,0 +1,41 @@\n+import requests\n+import unittest\n+\n+from dbt.exceptions import ConnectionException\n+from dbt.utils import _connection_exception_retry as connection_exception_retry\n+\n+\n+class testCoreDbtUtils(unittest.TestCase):\n+ def test_connection_exception_retry_none(self):\n+ ... | efbf59f256e19b2da8a52b11b7aede0b4bca5207 | diff --git a/core/dbt/clients/registry.py b/core/dbt/clients/registry.py
index 30b2c9020e6..1d6ac5c7675 100644
--- a/core/dbt/clients/registry.py
+++ b/core/dbt/clients/registry.py
@@ -1,10 +1,8 @@
-from functools import wraps
+import functools
import requests
-from dbt.exceptions import RegistryException
-from dbt.ut... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-3834@3762a8b | dbt-labs/dbt-core | Python | 3,834 | #3694 | resolves #3694
### Description
Normally for BigQuery connection profiles, dataset is a synonym for schema to reflect the BigQuery jargon but there was a bug for snapshots with this synonym.
Comments with conjunctions (eg. isn't, wasn't, aren't) do not play nicely with linting in vscode and were hard to read t... | 2021-08-30T12:05:13Z | dataset not a valid synonym for schema for snapshots when using bigquery
### Describe the bug
```
Running with dbt=0.20.0
Encountered an error:
Compilation Error in snapshot orders_snapshot (snapshots/orders.sql)
at path []: Snapshots must be configured with a 'strategy', 'unique_key', and 'target_schema'.
``... | @dbrtly Thanks for opening! It's totally reasonable that you'd expect this to work, and I think it will only take a touch of movie magic to make it so.
Each data warehouse adapter is able to define custom aliases, when that warehouse uses a different word from the one dbt generally uses. To that end, there's a `tran... | [
{
"body": "### Describe the bug\r\n\r\n```\r\nRunning with dbt=0.20.0\r\nEncountered an error:\r\nCompilation Error in snapshot orders_snapshot (snapshots/orders.sql)\r\n at path []: Snapshots must be configured with a 'strategy', 'unique_key', and 'target_schema'.\r\n``` \r\n\r\n\r\n### Steps To Reproduce\r\... | 464becacd019b4105c503db4d96a22a6caedcb16 | {
"head_commit": "3762a8bd89f7db016a0b067ed729b014dde41ddf",
"head_commit_message": "Update CHANGELOG.md\n\nBe more specific about the change to bigquery synonym for schema only.",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 68bb78cb968..2d12b5a930c 100644\n--- a/CHANGELOG.md\n+++ b/CHANGE... | [
{
"diff_hunk": "@@ -1,10 +1,10 @@\n {% snapshot snapshot_actual %}\n {# this used to be check_cols=('email',), which ought to be totally valid,\n- but isn't because type systems are hard. #}\n+ but is not because type systems are hard. #}\n {{\n config(\n target_database=var('t... | b3f968f4fbaf1f92558ad985aaee2318b151f56e | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f66d725642..b7450f61e2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
- to simplify config (default usage of `copy_materialization='table'` if is is not found in global or local config)
- to let copy several source tables into single target table at ... | {
"difficulty": "low",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-5790@9bc6cc1 | dbt-labs/dbt-core | Python | 5,790 | Flags work with Click | resolves #5529
### Description
Adds a new version of the flags module.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license... | 2022-09-08T16:04:49Z | [CT-905] Flags work with Click
User Story:
As a developer of `dbt-core` I want env vars to be handled in the same consistent manner as cli command parameters.
Acceptance Criteria:
* All Flags are implemented as click params / default values and as such as available within the context of a click command.
* Existin... | [
{
"body": "User Story:\r\nAs a developer of `dbt-core` I want env vars to be handled in the same consistent manner as cli command parameters.\r\n\r\nAcceptance Criteria:\r\n* All Flags are implemented as click params / default values and as such as available within the context of a click command.\r\n* Existing ... | e00eb9aa3a173ecf40f0e0190fb496a64d3ca876 | {
"head_commit": "9bc6cc1f01f2795e27dc4628239927e7ee8dd4ee",
"head_commit_message": "PR feedback",
"patch_to_review": "diff --git a/.changes/unreleased/Features-20220908-123650.yaml b/.changes/unreleased/Features-20220908-123650.yaml\nnew file mode 100644\nindex 00000000000..a68f1d55b23\n--- /dev/null\n+++ b/.cha... | [
{
"diff_hunk": "@@ -0,0 +1,386 @@\n+from pathlib import Path, PurePath\n+\n+import click\n+from dbt.cli.option_types import YAML\n+\n+# TODO: The name (reflected in flags) is a correction!\n+# The original name was `SEND_ANONYMOUS_USAGE_STATS` and used an env var called \"DBT_SEND_ANONYMOUS_USAGE_STATS\"\n+# B... | 3965703fe3f6fa3e6ebabb7f65aa2084688ca57f | diff --git a/.changes/unreleased/Features-20220908-123650.yaml b/.changes/unreleased/Features-20220908-123650.yaml
new file mode 100644
index 00000000000..a68f1d55b23
--- /dev/null
+++ b/.changes/unreleased/Features-20220908-123650.yaml
@@ -0,0 +1,7 @@
+kind: Features
+body: Flags work with new Click CLI
+time: 2022-09... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-4487@b2354af | dbt-labs/dbt-core | Python | 4,487 | New Dockerfile | resolves - Partially resolves #4495
### Description
Updated dockerfile. Images created should retain the previous dockerfile's functionality without requiring all the scripting and env var juggling.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x... | 2021-12-14T21:47:00Z | [Feature] Update Dockerfile and docker image release process
### Is there an existing feature request for this?
- [X] I have searched the existing issues
### Describe the Feature
Our Dockerfile/image release process has been at least somewhat broken since we divided the codebase into `dbt-core` + `<dbt-adaptername>`... | Duplicate of CORE-21 in Jira.
@iknox-fa Thanks for opening!
Here's a proposed build matrix, for when we should actually build/tag/push new images:
| image / tag | `latest` | minor latest (e.g. `1.0.latest`) | specific version (... | [
{
"body": "### Is there an existing feature request for this?\n\n- [X] I have searched the existing issues\n\n### Describe the Feature\n\nOur Dockerfile/image release process has been at least somewhat broken since we divided the codebase into `dbt-core` + `<dbt-adaptername>`. This ticket encompasses the work ... | 8463af35c3e9f09af94f3b334439b6f2358bc023 | {
"head_commit": "b2354af7e1e379916a627ec2291816a19bc711a5",
"head_commit_message": "Updated refs to be tag-based because bumpversion doesn't understand 'latest'",
"patch_to_review": "diff --git a/.bumpversion.cfg b/.bumpversion.cfg\nindex b7f332c4c17..c60dcf84bba 100644\n--- a/.bumpversion.cfg\n+++ b/.bumpversio... | [
{
"diff_hunk": "@@ -1,34 +1,127 @@\n-ARG BASE_IMAGE=python:3.8-slim-bullseye\n+##\n+# Generic dockerfile for dbt image building. \n+# See README for operational details\n+##\n \n-FROM $BASE_IMAGE\n-ARG BASE_REQUIREMENTS_SRC_PATH\n-ARG WHEEL_REQUIREMENTS_SRC_PATH\n-ARG DIST_PATH\n+##\n+# base image (abstract)... | 5e013e79147c3459e5548f10e1cbd789b226e1fb | diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2300c00d63a..c5a4e4ee7af 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -36,4 +36,4 @@ first_value = 1
[bumpversion:file:plugins/postgres/dbt/adapters/postgres/__version__.py]
-[bumpversion:file:docker/requirements/requirements.txt]
+[bumpversion:file... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-3606@acefced | dbt-labs/dbt-core | Python | 3,606 | BigQuery copy materialization enhancement | resolves #3570
### Description
1. Add implicit usage of `copy_materialization='table'` if it is not found in config (simplification for end-user)
2. Align `adapter.table_copy` implementation with [BigQuery documentation](https://cloud.google.com/bigquery/docs/managing-tables#copying_multiple_source_tables) (abil... | 2021-07-21T14:11:25Z | BigQuery 'copy' materialization doesn't work
Trying to check model:
```sql
{{ config(
materialized='copy'
)}}
select * from {{ source('int', 'Order_delta') }}
```
and receive following error:
```
Running with dbt=0.20.0
Found 2 models, 0 tests, 0 snapshots, 0 analyses, 166 macros, 0 operations, 0 seed... | @xemuliam You're right, this is an undocumented feature in dbt today, added by https://github.com/dbt-labs/dbt/pull/2709 last year. It's been useful, here or there, to have access to the `adapter.copy_table()` method—playing around with potential approaches to schema migration, or blue/green deployment. Frankly, I have... | [
{
"body": "Trying to check model:\r\n```sql\r\n{{ config(\r\n materialized='copy'\r\n)}}\r\n\r\nselect * from {{ source('int', 'Order_delta') }}\r\n```\r\n and receive following error:\r\n ```\r\nRunning with dbt=0.20.0\r\nFound 2 models, 0 tests, 0 snapshots, 0 analyses, 166 macros, 0 operations, 0 seed fil... | 9e796671dd55d4781284d36c035d1db19641cd80 | {
"head_commit": "acefced3f620833a4cf21d5f483f935e5830cf8e",
"head_commit_message": "Split long code ilnes",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 27252b6fcec..3c7400fb462 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,5 +1,11 @@\n ## dbt 0.21.0 (Release TBD)\n \n+### Features... | [
{
"diff_hunk": "@@ -0,0 +1,6 @@\n+version: 2\n+sources:\n+ - name: test_copy_several_tables\n+ schema: \"{{ target.schema) }}\"",
"line": null,
"original_line": 4,
"original_start_line": null,
"path": "test/integration/022_bigquery_test/copy-models/schema.yml",
"start_line": null,
"t... | 4202a6330a6f02e60911caa1bea4ec773e28c418 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27252b6fcec..8eeae1ff963 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,19 @@
## dbt 0.21.0 (Release TBD)
+### Features
+
+- Enhance BigQuery copy materialization ([#3570](https://github.com/dbt-labs/dbt/issues/3570), [#3606](https://github.com/dbt-labs/dbt/pul... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-3385@50906f9 | dbt-labs/dbt-core | Python | 3,385 | Running a snapshot with missing required configurations results in un... | …caught Python exception (#3381)
* Running a snapshot with missing required configurations results in uncaught Python exception
resolves #3381
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CON... | 2021-05-22T01:01:05Z | Running a snapshot with missing required configurations results in uncaught Python exception
### Describe the bug
In an attempt to educate myself on how snapshots work, I created a snapshot to test out, but neglected to realize that the configuration object was required. When I ran `dbt snapshot`, it failed with a fai... | @jnatkins Such a good issue, and a great catch, thank you for opening!
I think there's a pretty straightforward resolution here, which is adding a check to the `validate` method of `SnapshotConfig`:
https://github.com/fishtown-analytics/dbt/blob/e775f2b38e52e8b9f25f8ac98c942d22b2c8c55d/core/dbt/contracts/graph/mo... | [
{
"body": "### Describe the bug\r\nIn an attempt to educate myself on how snapshots work, I created a snapshot to test out, but neglected to realize that the configuration object was required. When I ran `dbt snapshot`, it failed with a fairly non-actionable error message:\r\n\r\n```\r\n2021-05-20T22:41:00.2911... | 835d805079dbcab590757afbd32b8edc38d43e4e | {
"head_commit": "50906f980864765a116d10693e90751ba107d139",
"head_commit_message": "Merge branch 'develop' of github.com:jnatkins/dbt into dbt-3381",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex a961c370613..f1fea0c233b 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -15,6 +15,7 @@\n - ... | [
{
"diff_hunk": "@@ -15,6 +15,7 @@\n - Add a better error messages for undefined macros and when there are less packages installed than specified in `packages.yml`. ([#2999](https://github.com/fishtown-analytics/dbt/issues/2999))\n - Separate `compiled_path` from `build_path`, and print the former alongside node... | 7508788e7eeba952092cca09b478a621b51feb7b | diff --git a/CHANGELOG.md b/CHANGELOG.md
index a961c370613..94572e78aa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
- Add a better error messages for undefined macros and when there are less packages installed than specified in `packages.yml`. ([#2999](https://github.com/fishtown-analytics/dbt/issue... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-3703@af88017 | dbt-labs/dbt-core | Python | 3,703 | Fix/bigquery job label length | resolves #3612
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Example:
resolves #1234
-->
### Description
<!--- Describe the Pull Request here... | 2021-08-06T14:54:40Z | Raise a more helpful error if BigQuery job label is too long
### Describe the bug
After migrating to v0.20.0 my jobs keep failing with the following error:
```
Database Error in model stg_facebookads__ads (models/staging/facebook_ads/stg_facebookads__ads.sql) ... | @edbizarro I see you switched on `query-comment.job-label`, which is new in v0.20.0. The way that feature works:
- Try reading your query comment as a dictionary. If it can, pass each key-value pair as a separate job label. "Sanitize" each value by replacing whitespace and special characters with underscores.
- If yo... | [
{
"body": "### Describe the bug\r\nAfter migrating to v0.20.0 my jobs keep failing with the following error:\r\n\r\n```\r\nDatabase Error in model stg_facebookads__ads (models/staging/facebook_ads/stg_facebookads__ads.sql) ... | a20d2d93d3adfa71d34916b4236956a13dfc9409 | {
"head_commit": "af880177036efa08d735a987e457d7cb602b44bb",
"head_commit_message": "Merge branch 'develop' of https://github.com/dbt-labs/dbt into fix/bigquery-job-label-length",
"patch_to_review": "diff --git a/plugins/bigquery/dbt/adapters/bigquery/connections.py b/plugins/bigquery/dbt/adapters/bigquery/connec... | [
{
"diff_hunk": "@@ -595,9 +595,18 @@ def _is_retryable(error):\n \n _SANITIZE_LABEL_PATTERN = re.compile(r\"[^a-z0-9_-]\")\n \n+_VALIDATE_LABEL_LENGTH_LIMIT = 63\n+\n \n def _sanitize_label(value: str) -> str:\n \"\"\"Return a legal value for a BigQuery label.\"\"\"\n value = value.strip().lower()\n ... | 79179363c9f3843f830ccdc1e5588b5217fa7321 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16a21a1696c..c1c07e82ada 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ Contributors:
### Under the hood
- Switch to full reparse on partial parsing exceptions. Log and report exception information. ([#3725](https://github.com/dbt-labs/dbt/issues/3725), [... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-4685@ad78d98 | dbt-labs/dbt-core | Python | 4,685 | include directory README | ### resolves https://github.com/dbt-labs/dbt-core/issues/4968
### Description
Writing up a README for the include directory giving brief description of each folder or file in top level.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] I have r... | 2022-02-04T21:15:58Z | [CT-433] [docs] Add ReadMe to include directory
### Is there an existing feature request for this?
- [X] I have searched the existing issues
### Describe the Feature
adding ReadMe to directories to deepen knowledge of code base for all
### Describe alternatives you've considered
_No response_
### Who will this be... | [
{
"body": "### Is there an existing feature request for this?\n\n- [X] I have searched the existing issues\n\n### Describe the Feature\n\nadding ReadMe to directories to deepen knowledge of code base for all\n\n### Describe alternatives you've considered\n\n_No response_\n\n### Who will this benefit?\n\neveryon... | 7f953a6d48a4db254b17fd3929d267e4b6069228 | {
"head_commit": "ad78d98c9457be60cff279d001109d2be5a079f1",
"head_commit_message": "minor updates",
"patch_to_review": "diff --git a/core/dbt/include/README.md b/core/dbt/include/README.md\nindex 59670b67f7d..a6d6c391c1e 100644\n--- a/core/dbt/include/README.md\n+++ b/core/dbt/include/README.md\n@@ -1 +1,10 @@\n... | [
{
"diff_hunk": "@@ -1 +1,10 @@\n-# Include README\n+# Include Module\n+\n+contains the a few key default `dbt-core` sub directories inlcuding.\n+\n+- `global_project` which defines the default implementations of jinja2 macros for `dbt-core ` which can be overwritten in each adapter repo to work more in line wit... | 5d531c30f922e72b1e8282e8149108a4a67f1734 | diff --git a/core/dbt/include/README.md b/core/dbt/include/README.md
index 59670b67f7d..4ec228788fb 100644
--- a/core/dbt/include/README.md
+++ b/core/dbt/include/README.md
@@ -1 +1,15 @@
-# Include README
+# Include Module
+
+The Include module is reponsible for housing default macro definitions, starter project scaff... | {
"difficulty": "low",
"estimated_review_effort": 1,
"problem_domain": "Documentation Updates"
} | |
dbt-labs__dbt-core-3165@5c50131 | dbt-labs/dbt-core | Python | 3,165 | Raise proper error message if duplicate macros found | resolves #2449
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Example:
resolves #1234
-->
### Description
<!--- Describe the Pull Request here... | 2021-03-14T19:35:11Z | Raise a better error message if dbt parses the same file twice due to misconfiguration
### Describe the feature
If a macro is addressed twice in a dbt project, then dbt will fail to compile with:
```
Compilation Error
dbt found two macros named "<macro name>" in the project "projectname".
To fix this error, r... | [
{
"body": "### Describe the feature\r\nIf a macro is addressed twice in a dbt project, then dbt will fail to compile with:\r\n```\r\nCompilation Error\r\n dbt found two macros named \"<macro name>\" in the project \"projectname\".\r\n To fix this error, rename or remove one of the following macros:\r\n ... | 9a6d30f03db0764f0d3178bcab092414a435df17 | {
"head_commit": "5c5013191be52146f732e46569e64f4a9d8a853e",
"head_commit_message": "Fix failing test",
"patch_to_review": "diff --git a/core/dbt/parser/results.py b/core/dbt/parser/results.py\nindex f2fc3b9d5f1..2bc01cfa50d 100644\n--- a/core/dbt/parser/results.py\n+++ b/core/dbt/parser/results.py\n@@ -125,7 +12... | [
{
"diff_hunk": "@@ -140,6 +140,21 @@ def add_macro(self, source_file: SourceFile, macro: ParsedMacro):\n ''',\n subtract=2\n )\n+ dup_path_msg = line_wrap_message(\n+ f\"\"\"\\\n+ The file {macro.original_file_path} for macro {... | 369b595e8a9cfae20dd62ca12dea0c3d2c59c2b5 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index c682e43d221..3600952defd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
- Moving from 'master' to 'HEAD' default branch in git ([#3057](https://github.com/fishtown-analytics/dbt/issues/3057), [#3104](https://github.com/fishtown-analytics/dbt/issues/3104), [#... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-3343@274dea0 | dbt-labs/dbt-core | Python | 3,343 | Add a better error for undefined macros | resolves #2999
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Example:
resolves #1234
-->
### Description
Adds a new `UndefinedMacroException`... | 2021-05-11T17:48:58Z | Raise a warning for required, but uninstalled packages
### Describe the feature
The error message for an uninstalled package comes straight out of the Jinja library:
```
Compilation Error in analysis scratch (analysis/scratch.sql)
'dbt_utils' is undefined
```
This error message _is_ strictly true, but I thi... | Love it. I'll take a look at some of the code paths involved, and see if this can be a good first issue
FYI, I finally stumbled upon this issue when googling this error message, so yes, updated error message would be very much appreciated.
The message for this is indeed coming from Jinja. The simplest version could jus... | [
{
"body": "### Describe the feature\r\nThe error message for an uninstalled package comes straight out of the Jinja library:\r\n```\r\nCompilation Error in analysis scratch (analysis/scratch.sql)\r\n 'dbt_utils' is undefined\r\n```\r\n\r\nThis error message _is_ strictly true, but I think it might be worth t... | 36e0ab9f42b006171e45ea2cc77faae9f5984eab | {
"head_commit": "274dea0fd590a4231aefb2c56bde0eeb23c6667e",
"head_commit_message": "Fix issue with null packages",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex f3ebcf1a5c3..6c15c62f1d5 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -6,6 +6,7 @@\n - Fix references to macros with package... | [
{
"diff_hunk": "@@ -328,10 +328,19 @@ def load_dependencies(self) -> Mapping[str, 'RuntimeConfig']:\n if self.dependencies is None:\n all_projects = {self.project_name: self}\n internal_packages = get_include_paths(self.credentials.type)\n- project_paths = itertools.ch... | 07b83d25fd02489e652d6e31785dfc4804ae4ca6 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5482779bdb4..c332f0732e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
- Stop clobbering default keyword arguments for jinja test definitions ([#3329](https://github.com/fishtown-analytics/dbt/issues/3329), [#3340](https://github.com/fishtown-analytics/dbt/... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-3182@e0febcb | dbt-labs/dbt-core | Python | 3,182 | Set application_name for Postgres connections | resolves #885
### Description
The `application_name` parameter can now be specified as part of the properties in a postgres target in `profiles.yml` and it will show in `pg_stat_activity`.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] I h... | 2021-03-20T17:28:40Z | Set application_name for Postgres connections
When creating a Postgres connection it's possible to set the "application_name" option on the connection, so that the connection is easily identifiable on the server's side. This would make the DB management easier for us.
Also, it'd be great if the name was changeable, ... | [
{
"body": "When creating a Postgres connection it's possible to set the \"application_name\" option on the connection, so that the connection is easily identifiable on the server's side. This would make the DB management easier for us.\r\n\r\nAlso, it'd be great if the name was changeable, so that we can identi... | 440a5e49e274b7c98a726c1acdd202fbf1063df1 | {
"head_commit": "e0febcb6c3f1dd80c413a349990e245743845ed7",
"head_commit_message": "Set application_name for Postgres connections",
"patch_to_review": "diff --git a/plugins/postgres/dbt/adapters/postgres/connections.py b/plugins/postgres/dbt/adapters/postgres/connections.py\nindex 96bb0b0f5d2..225fdb1d0f3 100644... | [
{
"diff_hunk": "@@ -23,6 +23,7 @@ class PostgresCredentials(Credentials):\n search_path: Optional[str] = None\n keepalives_idle: int = 0 # 0 means to use the default value\n sslmode: Optional[str] = None\n+ application_name: Optional[str] = None",
"line": null,
"original_line": 26,
"... | 91431401ad15788676a01743d36dba7401f06b67 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e9adfbf2c4..c18c7243737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
- Fix for EOL SQL comments prevent entire line execution ([#2731](https://github.com/fishtown-analytics/dbt/issues/2731), [#2974](https://github.com/fishtown-analytics/dbt/pull/2974))
... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-5027@8dcfeb1 | dbt-labs/dbt-core | Python | 5,027 | (#4884) Add support for ratio metrics | resolves #4884
### Description
This PR adds support for ratio metrics in dbt. A ratio metric is defined in terms of an expression, eg:
```
- name: arpc
label: Average Revenue per Customer
type: expression
sql: "{{ metric('revenue') }} / {{ metric('customers') }}"
```
This PR also adds a `... | 2022-04-11T14:54:44Z | [CT-376] add ability to calculate metrics based off of other metrics
In order to calculate any rate-type metrics there has to be a mechanism supported to calculate metrics based off of other metrics.
This could be implemented by expanding the inputs allowed in model. Instead of just referencing a materialized model ... | Thanks Mary! Moving this over to the dbt Core repo - I wasn't clear in Slack, my bad 😅
Absolutely critical that metrics can input to other metrics. If that's achieved by intermediary models initial, okay, but ultimately metrics need to be able to work like models - they can and will chain into each other. Perfectly ... | [
{
"body": "In order to calculate any rate-type metrics there has to be a mechanism supported to calculate metrics based off of other metrics.\r\n\r\nThis could be implemented by expanding the inputs allowed in model. Instead of just referencing a materialized model you could allow referencing a metric dynamical... | f49f28c331062c824351fe1babe4e4dd146f8d71 | {
"head_commit": "8dcfeb18667b752d31bf089d522395680eb99b5f",
"head_commit_message": "More support for ratio metrics",
"patch_to_review": "diff --git a/core/dbt/compilation.py b/core/dbt/compilation.py\nindex 052918d42e1..c94348f7190 100644\n--- a/core/dbt/compilation.py\n+++ b/core/dbt/compilation.py\n@@ -397,6 +... | [
{
"diff_hunk": "@@ -908,6 +953,31 @@ def resolve_source(\n return Disabled(disabled[0])\n return None\n \n+ def resolve_metric(\n+ self,\n+ target_metric_name: str,\n+ target_metric_package: Optional[str],\n+ current_project: str,\n+ node_package: str,\n... | e808272dea25ae9684b631dd132582cda92d3513 | diff --git a/.changes/unreleased/Features-20220705-083026.yaml b/.changes/unreleased/Features-20220705-083026.yaml
new file mode 100644
index 00000000000..6fcbf700100
--- /dev/null
+++ b/.changes/unreleased/Features-20220705-083026.yaml
@@ -0,0 +1,7 @@
+kind: Features
+body: Add support for ratio metrics
+time: 2022-07... | {
"difficulty": "high",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-3100@4f8c10c | dbt-labs/dbt-core | Python | 3,100 | Gets columns to update from config for BQ and Snowflake | resolves #1862
### Description
Incremental models currently default to updating all columns. For databases that support `merge` statements, this PR allows the user to pass in an `update_columns` config parameter to selectively update only a subset of columns by replacing the call to `adapter.get_columns_in_rel... | 2021-02-13T16:24:06Z | Specify Columns to update on incremental Models
### Describe the feature
Allow model developer the ability to choose the set of columns that require updating on incremental loads
### Who will this benefit?
This will benefit all users that are performing an incremental update of a wide table with few columns that a... | hey @richmintz! Can you say more about this? I think it's a good idea - I'm curious if you're interested in this feature for performance reasons, or something else.
Hi @drewbanin!
My primary goal would be performance, minimizing writes and index rebuilds. However I also think it will generate more concise sql for larg... | [
{
"body": "### Describe the feature\r\nAllow model developer the ability to choose the set of columns that require updating on incremental loads\r\n\r\n### Who will this benefit?\r\nThis will benefit all users that are performing an incremental update of a wide table with few columns that are mutable\r\n",
... | 934c23bf392c4d5db9b129d0f8953c2b7872f5b0 | {
"head_commit": "4f8c10c1aab3630f175611e87903b6051afdd8d8",
"head_commit_message": "default to get_columns_in_relation if not specified in config\n\nCo-authored-by: Jeremy Cohen <jtcohen6@gmail.com>",
"patch_to_review": "diff --git a/plugins/bigquery/dbt/include/bigquery/macros/materializations/incremental.sql b... | [
{
"diff_hunk": "@@ -58,7 +58,7 @@\n {% do adapter.expand_target_column_types(\n from_relation=tmp_relation,\n to_relation=target_relation) %}\n- {% set dest_columns = adapter.get_columns_in_relation(target_relation) %}\n+ {% set dest_columns = config.get('update_columns') %}",
... | 48e367ce2f116c85556f7ba64f2a0d34a3750314 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5647366ae08..1e9adfbf2c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
### Features
- Add optional configs for `require_partition_filter` and `partition_expiration_days` in BigQuery ([#1843](https://github.com/fishtown-analytics/dbt/issues/1843), [#2928]... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-3000@f13143a | dbt-labs/dbt-core | Python | 3,000 | Tsql not equal workaround | resolves #3001
@jtcohen6 @mikaelene
<!---
Include the number of the issue addressed by this PR above if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Example:
resolves #3001
-->
### Description
per this c... | 2021-01-08T20:11:58Z | condA != condB not supported in TSQL
`snapshot_check_strategy()` is not dispatched, which means it can only be overridden in a custom adapter. Which was working for `dbt-sqlserver` but we can't import that overwritten macro into `dbt-synapse` like we're doing with all the other properly dispatched macros.
rather tha... | [
{
"body": "`snapshot_check_strategy()` is not dispatched, which means it can only be overridden in a custom adapter. Which was working for `dbt-sqlserver` but we can't import that overwritten macro into `dbt-synapse` like we're doing with all the other properly dispatched macros.\r\n\r\nrather than dispatching ... | 30f473a2b1e261e3f4b712564df854f8a95134f3 | {
"head_commit": "f13143accba61bd5a514ce7b262e62e86bf66119",
"head_commit_message": "for posterity",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 706448c1132..1724cef8f94 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,7 +1,11 @@\n ## dbt 0.19.0 (Release TBD)\n \n+### Under the hood\n... | [
{
"diff_hunk": "@@ -164,7 +164,14 @@\n {%- for col in check_cols -%}\n {{ snapshotted_rel }}.{{ col }} != {{ current_rel }}.{{ col }}\n or\n- ({{ snapshotted_rel }}.{{ col }} is null) != ({{ current_rel }}.{{ col }} is null)\n+ {# hack to make CI try again #}\n+ {# below... | 6966ede68bba9631fa428b205e48274d0a32163c | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 706448c1132..55ccd4a388c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
## dbt 0.19.0 (Release TBD)
+### Under the hood
+- Rewrite logic in `snapshot_check_strategy()` to make compatible with other SQL dialects ([#3000](https://github.com/fishtown-analyti... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Code Refactoring / Architectural Improvement"
} | |
dbt-labs__dbt-core-3625@2a29dbd | dbt-labs/dbt-core | Python | 3,625 | `dbt init` Interactive profile creation | Resolves #3462
Overhaul `dbt init` to interactively create a profile within `profiles.yml` based on:
1. `profile_template.yml` if configured within the project
2. The chosen target's `target_options.yml` and user input
3. The chosen target's `sample_profiles.yml` profile
in descending order of preference. Th... | 2021-07-25T17:17:27Z | Add command to auto-populate `profiles.yml`
### Describe the feature
This may have been suggested already but I couldn't find a duplicate issue from a quick search.
Configuring the `profiles.yml` is non-beginner friendly, and creating instructions on how to do so is complicated especially due to the differences bet... | > Introducing a dbt command which would add a profile to `profiles.yml` (and create the file if needed) using the name from the `dbt_project.yml` would be extremely useful
Right on—I think this is what `dbt init` should do!
In fact, it already does a few of these things:
- Create the file `~/.dbt/profiles.yml` (... | [
{
"body": "### Describe the feature\r\nThis may have been suggested already but I couldn't find a duplicate issue from a quick search.\r\n\r\nConfiguring the `profiles.yml` is non-beginner friendly, and creating instructions on how to do so is complicated especially due to the differences between Mac and Window... | 280e9ad9c9bf914b5bbd1aa14629a6708c921546 | {
"head_commit": "2a29dbd1b764996b37899838e4a333300e56a022",
"head_commit_message": "Make mypy happy",
"patch_to_review": "diff --git a/core/dbt/clients/yaml_helper.py b/core/dbt/clients/yaml_helper.py\nindex df349c1bb38..9ed41d7c6ea 100644\n--- a/core/dbt/clients/yaml_helper.py\n+++ b/core/dbt/clients/yaml_helpe... | [
{
"diff_hunk": "@@ -1,17 +1,16 @@\n import dbt.exceptions\n from typing import Any, Dict, Optional\n-import yaml\n-import yaml.scanner\n+import oyaml as yaml",
"line": null,
"original_line": 3,
"original_start_line": null,
"path": "core/dbt/clients/yaml_helper.py",
"start_line": null,
"t... | 4f213ba4d549041ede0966e48153137c8b551bc8 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd21b3598f7..4c61b7aabc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,12 @@
- Enable `on-run-start` and `on-run-end` hooks for `dbt test`. Add `flags.WHICH` to execution context, representing current task ([#3463](https://github.com/dbt-labs/dbt-core/issues/346... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-2946@b025f20 | dbt-labs/dbt-core | Python | 2,946 | Defer iff unselected reference does not exist in current env | resolves #2909
### Description
Today, `--defer` is a blanket override: build the resources included by my selection criteria, and use the `--state` manifest's namespaces for any references to resources _not_ included by my selection criteria.
Instead, this PR would make it a more flexible fallback: If there's ... | 2020-12-12T00:29:27Z | Defer refers to outdated seed
### Describe the bug
I'm running the following on CI:
```bash
aws s3 cp $(MANIFEST_REMOTE_PATH) target/prod/manifest.json
dbt seed --select "state:modified+" --full-refresh --state target/prod/ --target dev-master
dbt run --models "state:modified+" --defer --state target/prod/ --ta... | Thanks for the writeup @dmateusp. The issue here is that `--defer` simply switches the reference of any resource not included in the selection criteria. As part of node selection, dbt excludes all resources from the selection criteria that are not relevant to the invocation type, e.g. a seed from `dbt run`. So today t... | [
{
"body": "### Describe the bug\r\nI'm running the following on CI:\r\n\r\n```bash\r\naws s3 cp $(MANIFEST_REMOTE_PATH) target/prod/manifest.json\r\ndbt seed --select \"state:modified+\" --full-refresh --state target/prod/ --target dev-master\r\ndbt run --models \"state:modified+\" --defer --state target/prod/ ... | cd149b68e83a7d3819bc0e8641f08a43ab4318b2 | {
"head_commit": "b025f208a870bb858d93d80fc67f32ccf208ee41",
"head_commit_message": "Check if relation exists before deferring",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 9e596be3ba8..3175f028278 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -17,6 +17,7 @@\n - dbt list command alway... | [
{
"diff_hunk": "@@ -898,10 +899,14 @@ def merge_from_artifact(\n refables = set(NodeType.refable())\n merged = set()\n for unique_id, node in other.nodes.items():\n+ current = self.nodes[unique_id]",
"line": null,
"original_line": 902,
"original_start_line": null,
... | 08e425bcf62b0b4b4cbb728a888435fa1d4b70e6 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e596be3ba8..3175f028278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
- dbt list command always return 0 as exit code ([#2886](https://github.com/fishtown-analytics/dbt/issues/2886), [#2892](https://github.com/fishtown-analytics/dbt/issues/2892))
- Set ... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2679@41a9251 | dbt-labs/dbt-core | Python | 2,679 | Create adapter.dispatch | resolves #2302 (the rest of it)
### Description
This is a follow-up to #2675.
This PR adds the `adapter.dispatch` described in #2302, and marked `adapter_macro` as deprecated. This is a pretty straightforward PR. The dispatch method happens on the "database wrapper" rather than the actual adapter, as adapters ... | 2020-08-03T17:24:15Z | Port adapter_macro implementation into Python
### Describe the feature
Right now, the `adapter_macro` implementation is written in jinja. It doesn't really do any string templating, so it's a better candidate for Python code. Rewriting this macro in Python would let us add some more comprehensive unit tests, and be mo... | [
{
"body": "### Describe the feature\r\nRight now, the `adapter_macro` implementation is written in jinja. It doesn't really do any string templating, so it's a better candidate for Python code. Rewriting this macro in Python would let us add some more comprehensive unit tests, and be more flexible with the impl... | ba828e59ded58a35d37c34abfe9ecd99012b0d8c | {
"head_commit": "41a92519822b7d2ca21b6616c50f0e31fc185fa3",
"head_commit_message": "pr feedback: better errors for dotted macro names\n\nadd more tests",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex d18c4c1d245..d96802a94cb 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -2,6 +2,10 @@\n... | [
{
"diff_hunk": "@@ -1096,38 +1148,23 @@ def adapter_macro(self, name: str, *args, **kwargs):\n ...\n {%- endmacro %}\n \"\"\"\n- original_name: str = name\n- package_name: Optional[str] = None\n+ deprecations.warn('adapter-macro', macro_name=name)\n+ ... | dd764b93e0e04ee68bfe184b7983b12f6a95b8ee | diff --git a/CHANGELOG.md b/CHANGELOG.md
index d18c4c1d245..19e8f80b23a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
### Breaking changes
- `adapter_macro` is no longer a macro, instead it is a builtin context method. Any custom macros that intercepted it by going through `context['dbt']` will need... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-2627@06a30f0 | dbt-labs/dbt-core | Python | 2,627 | Add more helpful error message for misconfiguration in profiles.yml | resolves [#2569](https://github.com/fishtown-analytics/dbt/issues/2569)
### Description
Adds an additional catch for if the supplied target returns no data and returns a more helpful error message.
### Checklist
- [X] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [... | 2020-07-15T21:50:56Z | Empty target in profiles.yml results in an unhelpful error message
### Steps to reproduce
1. Create a profile like so (note empty `learn:` key)
```
$ cat ~/.dbt/profiles.yml
jaffle_shop:
target: learn
outputs:
learn:
```
2. Run `dbt debug --profile jaffle_shop`
### Expected behavior
A useful erro... | just an fyi, im working on this now | [
{
"body": "### Steps to reproduce\r\n1. Create a profile like so (note empty `learn:` key)\r\n```\r\n$ cat ~/.dbt/profiles.yml\r\njaffle_shop:\r\n target: learn\r\n\r\n outputs:\r\n learn:\r\n```\r\n2. Run `dbt debug --profile jaffle_shop`\r\n\r\n### Expected behavior\r\nA useful error message\r\n\r\n### A... | 4e636aa53abf4e0ac401f9c45d3bf2d648fd4d2f | {
"head_commit": "06a30f0447382224aae42743e48b022d45e8fab1",
"head_commit_message": "Add more helpful error message for misconfiguration in profiles.yml",
"patch_to_review": "diff --git a/core/dbt/config/profile.py b/core/dbt/config/profile.py\nindex b3c145348ca..3da2936fdea 100644\n--- a/core/dbt/config/profile.... | [
{
"diff_hunk": "@@ -197,6 +197,11 @@ def _get_profile_data(\n .format(profile_name, target_name, outputs))\n raise DbtProfileError(msg, result_type='invalid_target')\n profile_data = outputs[target_name]\n+\n+ if profile_data is None:",
"line": null,
"origin... | d08a2b8c02746985a4e83e89ff9cf0a2a986a2b6 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45b98820875..7d65de573a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,14 @@
### Features
- Added support for Snowflake query tags at the connection and model level ([#1030](https://github.com/fishtown-analytics/dbt/issues/1030), [#2555](https://github.com/fis... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2530@272cad7 | dbt-labs/dbt-core | Python | 2,530 | Add data processed info into dbt run logs for all statement types | resolves #2526
### Description
Changing the log output of BigQuery query CREATE_TABLE_AS_SELECT statement to include byte processed.
### Checklist
- [X] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] I have run this code in development and it appears to resolv... | 2020-06-10T19:00:24Z | Add data processed info into dbt run logs for all statement types
### Describe the feature
When using BigQuery `dbt run` logs should show the data scan value for create table statement and not just for script.
### Describe alternatives you've considered
No alternative
### Additional context
This specific impro... | Very cool idea!
The code for printing out bytes billed is fairly straightforward:
https://github.com/fishtown-analytics/dbt/blob/c9b34681b756ccd4b5c4f0a3bd8f12f48f23081d/plugins/bigquery/dbt/adapters/bigquery/connections.py#L250-L252
I think it would just be a matter of reporting the `total_bytes_processed` for ... | [
{
"body": "### Describe the feature\r\nWhen using BigQuery `dbt run` logs should show the data scan value for create table statement and not just for script.\r\n\r\n### Describe alternatives you've considered\r\nNo alternative\r\n\r\n### Additional context\r\nThis specific improvement is about BigQuery. However... | 8f649f5ab43feded93180a7128a90a43ded97041 | {
"head_commit": "272cad7b97fa7b5c4890b1c431714f0881fec5e6",
"head_commit_message": "core/dbt/utils: remove extra empty line",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex f31a038398e..48393197dcb 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -11,10 +11,12 @@\n - Added support for rena... | [
{
"diff_hunk": "@@ -11,17 +11,20 @@\n - Added support for renaming BigQuery relations ([#2520](https://github.com/fishtown-analytics/dbt/issues/2520), [#2521](https://github.com/fishtown-analytics/dbt/pull/2521))\n - Added support for BigQuery authorized views ([#1718](https://github.com/fishtown-analytics/dbt/... | 1da4bef068fe441c3001d0fefc20204297bb59c4 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index f31a038398e..d03131c1ec8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,12 @@
- Added support for renaming BigQuery relations ([#2520](https://github.com/fishtown-analytics/dbt/issues/2520), [#2521](https://github.com/fishtown-analytics/dbt/pull/2521))
- Adde... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-2594@b94d0b6 | dbt-labs/dbt-core | Python | 2,594 | added option --adapter to dbt init, to create sample profiles.yml bas… | resolves [#2533](https://github.com/fishtown-analytics/dbt/issues/2533)
### Description
Added option '--adapter' to `dbt init`, to create sample profiles.yml based on chosen adapter.
It gets the sample profiles.yml from the adapter 'includes' folder
Related PRs:
* https://github.com/fishtown-analytics/db... | 2020-06-25T22:31:19Z | Write database-specific sample profiles.yml file in `dbt init`
### Describe the feature
Let's add a flag to `dbt init` which controls the sample contents of the `~/.dbt/profiles.yml` file.
Example usage:
```
dbt init my-project --adapter=bigquery
dbt init my-project --adapter=snowflake
dbt init my-project --... | I'm happy to take this, if still available @drewbanin
I'm trying to set up a try-catch with the possible adapter options, but can't seem to find a 'list' of possible adapters. I found some stuff in `dbt/core/dbt/include/global_project/macros/adapters/common.sql` but not sure this is it.
My idea is to create a templ... | [
{
"body": "### Describe the feature\r\n\r\nLet's add a flag to `dbt init` which controls the sample contents of the `~/.dbt/profiles.yml` file. \r\n\r\nExample usage:\r\n```\r\ndbt init my-project --adapter=bigquery\r\ndbt init my-project --adapter=snowflake\r\ndbt init my-project --adapter=redshift\r\n```\r\n\... | 3af8a22d1319431115e7394f1235294613d36b35 | {
"head_commit": "b94d0b66e6b366d84669454dca199e4fe5612870",
"head_commit_message": "Apply suggestions from code review\n\nCo-authored-by: Jeremy Cohen <jtcohen6@gmail.com>",
"patch_to_review": "diff --git a/.gitignore b/.gitignore\nindex d1025d4ef4c..e3ebed6763f 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -9,... | [
{
"diff_hunk": "@@ -0,0 +1,25 @@\n+default:\n+ outputs:\n+\n+ dev:\n+ type: redshift\n+ threads: [1 or more]\n+ host: [host]\n+ port: 5439\n+ user: [dev_username]\n+ pass: [dev_password]\n+ dbname: [dbname]\n+ schema: [dev_schema]\n+\n+ prod:\n+ type: redshift... | 51f17d33583ee591b831d5ef9d37de4a8f1f4e32 | diff --git a/.gitignore b/.gitignore
index d1025d4ef4c..e3ebed6763f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ __pycache__/
# Distribution / packaging
.Python
env/
+dbt_env/
build/
develop-eggs/
dist/
@@ -83,3 +84,11 @@ target/
# pycharm
.idea/
+
+# AWS credentials
+.aws/
+
+.DS_Store
+
+# vscod... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-2413@5a319d6 | dbt-labs/dbt-core | Python | 2,413 | Fix error when trying to call list_schemas macro for BigQuery adapter | resolves #2412
### Description
Adds missing `database` parameter to `adapter.list_schemas` macro that is called by `bigquery__list_schemas`
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] I have run this code in development and it appears to r... | 2020-05-06T21:21:20Z | Running BigQuery list_schemas macro produces error
### Describe the bug
When attempting to run the `list_schemas` macro from a BigQuery dbt project, you get the following error
```
list_schemas() missing 1 required positional argument: 'database'
```
### Steps To Reproduce
Create a test macro in a BigQuery dbt ... | [
{
"body": "### Describe the bug\r\nWhen attempting to run the `list_schemas` macro from a BigQuery dbt project, you get the following error\r\n```\r\nlist_schemas() missing 1 required positional argument: 'database'\r\n```\r\n\r\n### Steps To Reproduce\r\nCreate a test macro in a BigQuery dbt project that invok... | 9cd7cbc9e35e5a7c8c4f17a3d113263f4421ab55 | {
"head_commit": "5a319d6ee1278509971f6c92b69c02c877aa3b71",
"head_commit_message": "Updated CHANGELOG.md",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 2c0b12568f0..4c69547d6c3 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -3,6 +3,7 @@\n ### Fixes\n - When tracking is disabled due to ... | [
{
"diff_hunk": "@@ -3,6 +3,7 @@\n ### Fixes\n - When tracking is disabled due to errors, do not reset the invocation ID ([#2398](https://github.com/fishtown-analytics/dbt/issues/2398), [#2400](https://github.com/fishtown-analytics/dbt/pull/2400))\n - Fix for logic error in compilation errors for duplicate data ... | 002244e3b39fc3f7618667ed89d37b73379a1c80 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c0b12568f0..e63d85a611b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
### Fixes
- When tracking is disabled due to errors, do not reset the invocation ID ([#2398](https://github.com/fishtown-analytics/dbt/issues/2398), [#2400](https://github.com/fishtown... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-2411@e392212 | dbt-labs/dbt-core | Python | 2,411 | Preserve the case of schemas and databases when listing relations (#2403) | resolves #2403
### Description
There's hopefully nothing too wild or controversial in here - this is a substantial change, but it should fix some correctness issues in how dbt lists schemas. I think in the long run this will be more pleasant for adapter authors than having to figure out how to render the databas... | 2020-05-06T19:41:10Z | dbt seed not working in 0.17.0-b1
### Describe the bug
dbt seed fails to load seed files
### Steps To Reproduce
`dbt seed --full-refresh`
### Expected behavior
with 0.16 --full-refresh was not required, now it seems to be but is not working (yet?)
### Screenshots and log output
```
Completed with 7 errors... | This has something to do with quoting/casing - it works fine without. Probably caused by this PR: https://github.com/fishtown-analytics/dbt/pull/2322
@swiffer I can't seem to reproduce this locally, please let me know if I'm missing a step:
- create a seed file (`data/seedtable.csv`)
- in `dbt_project.yml`, set `... | [
{
"body": "### Describe the bug\r\ndbt seed fails to load seed files\r\n\r\n### Steps To Reproduce\r\n`dbt seed --full-refresh`\r\n\r\n### Expected behavior\r\nwith 0.16 --full-refresh was not required, now it seems to be but is not working (yet?)\r\n\r\n### Screenshots and log output\r\n```\r\nCompleted with 7... | 1eb75d9be7fb0a551cc3e2fb3eac8a50498ad8f1 | {
"head_commit": "e392212c0e34ee1fe8759d46b402d13342d874f7",
"head_commit_message": "Change list_relations_without_caching macro to take a single argument\n\nThe argument is a Relation object with no identifier field, configured with the appropriate quoting information\n\nUnique quoted/unquoted representations will... | [
{
"diff_hunk": "@@ -496,21 +491,23 @@ def create_schema(db: str, schema: str) -> None:\n for ls_future in as_completed(list_futures):\n existing_schemas_lowered.update(ls_future.result())\n \n- for info, schema in required_schemas.search():\n+ for info in requir... | ab8392b856a9a47e62a49d41dd26f5ad63dab9b7 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 223f566da52..2522d397169 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,23 @@
## dbt 0.17.0 (Release TBD)
+### Breaking changes
+- The `list_relations_without_caching`, `drop_schema`, and `create_schema` macros and methods now accept a single argument of a Rel... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2395@af5af82 | dbt-labs/dbt-core | Python | 2,395 | Add a special as_text filter to the native env (#2384) | resolves #2384
### Description
Add a special as_text filter to the native env that tells dbt to render the value as a string no matter what.
Use like `dataset: "{{ 1991 | as_text }}"` -> `dataset: "1991"`
Also, I moved the weird special quoting handling logic out and instead avoid calling the renderer on colum... | 2020-05-04T19:17:30Z | Regression: dbt does not allow integer dataset names on BigQuery
### Describe the bug
BigQuery allows stringy dataset names that contain only digits, but dbt fails at startup if such a dataset name is provided. Is this a function of dbt's new NativeEnvironment rendering for jinja?
### Steps To Reproduce
Use a prof... | >Is this a function of dbt's new NativeEnvironment rendering for jinja?
Yes, almost certainly. I can think of two ways to approach this:
- figure out how to tell the renderer that "this value should come out as a string". I'm not sure if that's hard or not, but I bet it isn't simple. This probably involves somethi... | [
{
"body": "### Describe the bug\r\nBigQuery allows stringy dataset names that contain only digits, but dbt fails at startup if such a dataset name is provided. Is this a function of dbt's new NativeEnvironment rendering for jinja?\r\n\r\n### Steps To Reproduce\r\nUse a profile like:\r\n```\r\n dev:\r\n ... | b5f99881fedf403d7939de2e3f261666e446ccd3 | {
"head_commit": "af5af829cf2cfe6c5d186028546a7a22e5aa3bd3",
"head_commit_message": "add missing as_text to sources tests",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 6d5fb85c847..5c02b5dce67 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -23,6 +23,7 @@\n - schema.yml files are now fu... | [
{
"diff_hunk": "@@ -428,7 +434,11 @@ def get_environment(\n else:\n env_cls = MacroFuzzEnvironment\n \n- return env_cls(**args)\n+ env = env_cls(**args)\n+ if native:\n+ env.filters['as_text'] = TextMarker",
"line": null,
"original_line": 439,
"original_start_line": null,... | 229d3986c2bf5f45c7bd12a9df5d00757d0c15f3 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d5fb85c847..5c02b5dce67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
- schema.yml files are now fully rendered in a context that is aware of vars declared in from dbt_project.yml files ([#2269](https://github.com/fishtown-analytics/dbt/issues/2269), [#2... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2749@b71b7e2 | dbt-labs/dbt-core | Python | 2,749 | Include hard-deletes when making snapshot | Continues the work of the closed PR #2355, which resolves #249.
### Description
The idea is to select ids from the snapshotted table which no longer exist in the source table, and update these to set `dbt_valid_to` to the current timestamp. Marking them as hard deleted.
As of now, I didn't write any integrat... | 2020-09-11T08:12:59Z | snapshots should handle hard deletes
Currently, `dbt archive` stores a series of state changes for records in covered tables, but it does not store a state change for deleted records. Hard deletes in an OLTP database will likely be one of the primary use cases for archival, and we therefore want to make sure that we're... | this might need to be a completely separate run through the table, which would eat up additional resources. if that turns out to be true, we should allow people to opt out of this in configuration if they know the source data never performs deletes.
let me have a think about this. definitely a good idea
Just a note tha... | [
{
"body": "Currently, `dbt archive` stores a series of state changes for records in covered tables, but it does not store a state change for deleted records. Hard deletes in an OLTP database will likely be one of the primary use cases for archival, and we therefore want to make sure that we're capturing record ... | 4994cc07a01b562e9687dcba132d2b1432421a08 | {
"head_commit": "b71b7e209ea6500490b841242ede1e9088b2b96c",
"head_commit_message": "Update changelog",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 2303cfefa2f..8b988ed1b4e 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -3,6 +3,10 @@\n ### Features\n - dbt will compare configurations u... | [
{
"diff_hunk": "@@ -66,6 +66,7 @@\n {% macro snapshot_timestamp_strategy(node, snapshotted_rel, current_rel, config, target_exists) %}\n {% set primary_key = config['unique_key'] %}\n {% set updated_at = config['updated_at'] %}\n+ {% set invalidate_hard_deletes = config['invalidate_hard_deletes'] %}"... | a4b80cc2e4146c8fc76d02eaa797af1894f40245 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59a2ef92d4a..6c3a864f51d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
- dbt will compare configurations using the un-rendered form of the config block in dbt_project.yml ([#2713](https://github.com/fishtown-analytics/dbt/issues/2713), [#2735](https://gith... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-2348@4bea303 | dbt-labs/dbt-core | Python | 2,348 | Fix for non-json-serializable values in BigQuery nested columns | resolves #2336
### Description
Use the Decimal-aware json encoder when constructing an agate table from a nested BigQuery response
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] I have run this code in development and it appears to resolve t... | 2020-04-21T18:22:50Z | run_sql command via dbt rpc returns Object of type Decimal is not JSON serializable
### Describe the bug
Executing a `run_sql` command via `dbt rbc` against a BigQuery profile returns `Object of type Decimal is not JSON serializable`. The equivalent command against Redshift, Snowflake, and PostgreSQL connections works... | Thanks for the report @brettgriffin - this error occurs if a `numeric` column is found inside of a struct or array column in BigQuery | [
{
"body": "### Describe the bug\r\nExecuting a `run_sql` command via `dbt rbc` against a BigQuery profile returns `Object of type Decimal is not JSON serializable`. The equivalent command against Redshift, Snowflake, and PostgreSQL connections works correctly.\r\n\r\n### Steps To Reproduce\r\nA model exists wit... | c05b45b241b6394222675e63b98dfb19d4633023 | {
"head_commit": "4bea303c5f846678390a131dadb79180202e5de2",
"head_commit_message": "(#2336) Fix for non-json-serializable values in BigQuery nested columns",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 758f59aee8a..6d8390465d5 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -23,6 +23,7... | [
{
"diff_hunk": "@@ -23,6 +23,7 @@\n - Fix skipped node count in stdout at the end of a run ([#2095](https://github.com/fishtown-analytics/dbt/issues/2095), [#2310](https://github.com/fishtown-analytics/dbt/pull/2310))\n - Fix an issue where BigQuery incorrectly used a relation's quote policy as the basis for th... | 044f8fce4eebdae5751352de53dc17478c9435a6 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758f59aee8a..e60e6000fa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
- Fix skipped node count in stdout at the end of a run ([#2095](https://github.com/fishtown-analytics/dbt/issues/2095), [#2310](https://github.com/fishtown-analytics/dbt/pull/2310))
-... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2343@385f7f2 | dbt-labs/dbt-core | Python | 2,343 | Added warning to nodes selector if nothing was matched | resolves #2115
### Description
Added warning (or error when `--warn-error` provided) when resource selector fails due to lack of resources for example when the incorrect model name was provided.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] ... | 2020-04-19T13:17:42Z | Warning should be surfaced if any part of the `--models` specification doesn't exist
### Describe the bug
A clear and concise description of what the bug is. What command did you run? What happened?
Assume `model_a` exists and `model_b` does not exist in a given dbt project.
If you run `dbt run --models model_b`... | Thanks for the report @kingfink - this is a good idea! We should make this a highly visible warning that can be raised to an error using the `--warn-error` flag
@drewbanin seems like this is somewhat related to https://github.com/fishtown-analytics/dbt/issues/1765?
ha! Thanks @jeremyyeo - I was looking for that one! J... | [
{
"body": "### Describe the bug\r\nA clear and concise description of what the bug is. What command did you run? What happened?\r\n\r\nAssume `model_a` exists and `model_b` does not exist in a given dbt project.\r\n\r\nIf you run `dbt run --models model_b` you get an error: `WARNING: Nothing to do...`.\r\n\r\nI... | 784ab79eec72f776b7f57699fab101be35cac81b | {
"head_commit": "385f7f2c2419a4b9d45a9e3f5bb58bc4f84ef268",
"head_commit_message": "Merge branch 'dev/octavius-catto' into warn-nothing-selected",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 3d1dec6671f..e4f723a04bd 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,12 +1,16 @@\n ## db... | [
{
"diff_hunk": "@@ -380,18 +388,47 @@ def get_nodes_from_spec(self, graph, spec):\n \n return collected\n \n- def select_nodes(self, graph, raw_include_specs, raw_exclude_specs):\n- selected_nodes: Set[str] = set()\n+ def get_nodes_from_multiple_specs(\n+ self,\n+ grap... | cfeffe40f6474436fec5eab10c0577a1ca2c5702 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d1dec6671f..e4f723a04bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,16 @@
## dbt 0.17.0 (Release TBD)
### Features
+- Added warning to nodes selector if nothing was matched ([#2115](https://github.com/fishtown-analytics/dbt/issues/2115), [#2343](https://g... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2104@bf3f5e1 | dbt-labs/dbt-core | Python | 2,104 | Attach cli vars to configs when they come in via the RPC server (#2092) | Fixes #2092
This fixes #2092 by attaching the parsed CLI `vars` to the config when running the "cli_args" RPC command. This has the downside of clobbering any arguments provided via `dbt rpc --vars "{...}"`. Hopefully that's a sacrifice we're willing to make! | 2020-02-07T19:41:54Z | [BUG] Command line variable ignored when supplied to command in server
### Describe the bug
When I run this command against the `cli` method in the server:
```
dbt run --vars '{period_start_date: '2019-04-01', period: 'day'}' -m buildings
```
the command line variables are ignored. Instead I would expect the comma... | Hi, this also happens when we run a job and pass to it variables options as part of the dbt run command. | [
{
"body": "### Describe the bug\r\nWhen I run this command against the `cli` method in the server:\r\n```\r\ndbt run --vars '{period_start_date: '2019-04-01', period: 'day'}' -m buildings\r\n```\r\nthe command line variables are ignored. Instead I would expect the command line variables to be present in the con... | 9df123a1808e2bd7547ba00aaae7935e12c5edb8 | {
"head_commit": "bf3f5e1b920333de7103f3ac17cc9c2231cb4509",
"head_commit_message": "Attach cli vars to configs when they come in via the RPC server",
"patch_to_review": "diff --git a/core/dbt/task/rpc/cli.py b/core/dbt/task/rpc/cli.py\nindex e3bb477c454..b0fc3e0da6f 100644\n--- a/core/dbt/task/rpc/cli.py\n+++ b/... | [
{
"diff_hunk": "@@ -36,6 +37,11 @@ def __init__(self, args, config, manifest):\n \n def set_config(self, config):\n super().set_config(config)\n+\n+ # patch up config with args/cli_vars\n+ self.config.args = self.args\n+ self.config.cli_vars = parse_cli_vars(getattr(self.args, '... | 61adfe42ff4dd4d120348a232a4fb5c194a6170d | diff --git a/core/dbt/task/rpc/cli.py b/core/dbt/task/rpc/cli.py
index e3bb477c454..d5bb61b6d96 100644
--- a/core/dbt/task/rpc/cli.py
+++ b/core/dbt/task/rpc/cli.py
@@ -1,5 +1,6 @@
import abc
import shlex
+import yaml
from typing import Type, Optional
@@ -12,6 +13,7 @@
Result,
)
from dbt.exceptions import... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2078@9eaf243 | dbt-labs/dbt-core | Python | 2,078 | making error msg for malformed packages.yml better | I messed up the [previous](https://github.com/fishtown-analytics/dbt/pull/2077) PR during rebase and it was automatically closed. Here's new and clean one.
Fixes #2017 | 2020-01-30T10:00:03Z | Unhelpful error message with malformed packages.yml
### Describe the bug
```
MacBook-Pro:analytics tristan$ cat packages.yml
packages:
- package: fishtown-analytics/stripe
revision: 0.3.1
```
I had recently switched from a git reference to this package to a hub reference, and forgot that I needed to chan... | well `local` is actually also valid error, since it could be the case if package is stored locally. I can suggest error msg like `packages.yml is malformed, please make sure that it matches https://docs.getdbt.com/docs/package-management#section-how-do-i-add-a-package-to-my-project`
good idea @sonac - are you interest... | [
{
"body": "### Describe the bug\r\n```\r\nMacBook-Pro:analytics tristan$ cat packages.yml\r\npackages:\r\n - package: fishtown-analytics/stripe\r\n revision: 0.3.1\r\n```\r\n\r\nI had recently switched from a git reference to this package to a hub reference, and forgot that I needed to change from `revision... | e570d22f402cd09abe6d0b6770a4d5a1ac8bfa22 | {
"head_commit": "9eaf2438dde7fb26e8638f280eeea4a49be254b8",
"head_commit_message": "making error msg for malformed packages.yml better",
"patch_to_review": "diff --git a/core/dbt/config/project.py b/core/dbt/config/project.py\nindex 620aa0773bc..3fb5fc73f66 100644\n--- a/core/dbt/config/project.py\n+++ b/core/db... | [
{
"diff_hunk": "@@ -59,6 +59,11 @@\n --no-version-check\n \"\"\"\n \n+MALFORMED_PACKAGE_ERROR = \"\"\"\\\n+packages.yml is malformed, please make sure that it matches ",
"line": null,
"original_line": 63,
"original_start_line": null,
"path": "core/dbt/config/project.py",
"start_line": null,
... | d354aa6f093e3533adfbf907cd720e45619bb0e3 | diff --git a/core/dbt/config/project.py b/core/dbt/config/project.py
index 620aa0773bc..3ba025fa7cc 100644
--- a/core/dbt/config/project.py
+++ b/core/dbt/config/project.py
@@ -59,6 +59,17 @@
--no-version-check
"""
+MALFORMED_PACKAGE_ERROR = """\
+The packages.yml file in this project is malformed. Please double ch... | {
"difficulty": "low",
"estimated_review_effort": 1,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2164@1f49150 | dbt-labs/dbt-core | Python | 2,164 | removing the requirement to have a passphrase on a Snowflake key | resolves #1805
### Description
This PR removes the requirement to have a passphrase when authenticating with a Snowflake key pair. Snowflake key pairs without passphrases are supported by Snowflake, but are not currently supported by dbt.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.c... | 2020-02-27T15:36:30Z | Allow no-passphrase private keys
### Describe the bug
The Snowflake connector (at least) requires a passphrase in the profile file to open a private key connection.
### Steps To Reproduce
Create a dbt target like the following:
```
qa:
type: snowflake
account: my_account
user: my_user
... | I know how to just make it work within the Snowflake connection, but don't know how to do more involved things like requiring a flag in the project or profile file.
Thanks for the suggestion @kmbenitez! The operative code for private key Snowflake connections is around here:
https://github.com/fishtown-analytics/dbt/... | [
{
"body": "### Describe the bug\r\nThe Snowflake connector (at least) requires a passphrase in the profile file to open a private key connection.\r\n\r\n### Steps To Reproduce\r\nCreate a dbt target like the following:\r\n```\r\n qa:\r\n type: snowflake\r\n account: my_account\r\n user: my_use... | 735ffb3c920c41a41b571b61a2eac8db9b29f5e4 | {
"head_commit": "1f49150d3054b50e348305f65bfbf1da957e86c8",
"head_commit_message": "updating changelog",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex ef7ba64c17b..2577891fead 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -9,6 +9,7 @@\n - Add a dbt-{dbt_version} user agent field to the... | [
{
"diff_hunk": "@@ -9,6 +9,7 @@\n - Add a dbt-{dbt_version} user agent field to the bigquery connector ([#2121](https://github.com/fishtown-analytics/dbt/issues/2121), [#2146](https://github.com/fishtown-analytics/dbt/pull/2146))\n - Add support for `generate_database_name` macro ([#1695](https://github.com/fis... | 1edffac2bc88cf558be1de606921f7f066a3a78f | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 098fd809bb9..e1d7c731bc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
- Adding optional "sslmode" parameter for postgres ([#2152](https://github.com/fishtown-analytics/dbt/issues/2152), [#2154](https://github.com/fishtown-analytics/dbt/pull/2154))
- Add... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2224@c961301 | dbt-labs/dbt-core | Python | 2,224 | Add --fail-fast argument for dbt run and dbt test | resolves #1649
### Description
Optional flag `-x` or `--fail-fast` which enforce a `dbt run` to end up on first error (or test failure during `dbt test`). It's really beneficial during long-time runs and development (Continuous Integration pipelines will be grateful).
**I'm currently looking for suggestions ho... | 2020-03-20T14:36:50Z | Feature Request: --fail-fast argument for dbt run and dbt test
## Feature
`--fail-fast` argument for `dbt run` and `dbt test`
### Feature description
An optional argument, `--fail-fast`, for dbt run and dbt test which will stop model builds or test runs upon a single failure. It may also be worth adding a paramete... | Thanks @JasonGluck! I think we might have built this at a hackathon once, but I don't think the code ever made it into prod :/
I think the operative line of code is [right here](https://github.com/fishtown-analytics/dbt/blob/7177a6543b56d5d90446710e7295aaebeb415092/core/dbt/task/runnable.py#L113). I imagine we could... | [
{
"body": "## Feature\r\n`--fail-fast` argument for `dbt run` and `dbt test`\r\n\r\n### Feature description\r\nAn optional argument, `--fail-fast`, for dbt run and dbt test which will stop model builds or test runs upon a single failure. It may also be worth adding a parameter which will define the amount of fa... | ca232dbdf4b7fd68c1e57b835167c24027aeda65 | {
"head_commit": "c9613016e2bc4e14c0cbff76a42f7c1786f8e535",
"head_commit_message": "Added --fail-fast argument for dbt run and dbt test",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 9e1d53bda28..e8317f9dc1e 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,8 +1,13 @@\n ## dbt next (re... | [
{
"diff_hunk": "@@ -281,6 +281,17 @@ def __init__(self, message, project=None, result_type='invalid_project'):\n self.result_type = result_type\n \n \n+class FailFastException(Exception):",
"line": null,
"original_line": 284,
"original_start_line": null,
"path": "core/dbt/exceptions.py",... | 0a0e71a9ff4bb967030503333cf9721e6414a5a0 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef933506b09..782bf79bee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
## dbt next (release TBD)
+### Features
+- Added --fail-fast argument for dbt run and dbt test to fail on first test failure or runtime error. ([#1649](https://github.com/fishtown-analyt... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-2067@ba3e14c | dbt-labs/dbt-core | Python | 2,067 | fix an RPC hang when enddocs tags were missing (#2066) | Fix #2066
Fix an issue with rendering the output of a failed jinja block parsing pass where dbt would raise an exception while raising an exception, due to `str(exc)` failing by implementing a TODO I wrote a long time ago...
Added tests so we don't experience this again, hopefully. | 2020-01-24T15:26:28Z | dbt server fails to reload on HUP if docs block is missing enddocs tag
### Describe the bug
When running the dbt server, invalid jinja code can cause the server to get stuck in a "compiling" state. This does _not_ require partial parsing to be enabled.
### Steps To Reproduce
1. Create a file, `models/docs.md` with... | [
{
"body": "### Describe the bug\r\nWhen running the dbt server, invalid jinja code can cause the server to get stuck in a \"compiling\" state. This does _not_ require partial parsing to be enabled.\r\n\r\n### Steps To Reproduce\r\n1. Create a file, `models/docs.md` with the following contents:\r\n```\r\n{% docs... | 66a4f76c74b8b19ff1d438f76f3a9936b4468f0b | {
"head_commit": "ba3e14cefddd5ffbc0dc52d2d18d84a0a004abcd",
"head_commit_message": "fix an RPC hang when enddocs tags were missing, add tests",
"patch_to_review": "diff --git a/core/dbt/clients/_jinja_blocks.py b/core/dbt/clients/_jinja_blocks.py\nindex 8d9ce891bdc..34778b9f28b 100644\n--- a/core/dbt/clients/_ji... | [
{
"diff_hunk": "@@ -357,8 +357,8 @@ def find_blocks(self, allowed_blocks=None, collect_raw_data=True):\n \n if self.current:\n dbt.exceptions.raise_compiler_error((\n- 'Reached EOF without finding a close block for '\n- '{0.block_type_name} (from {0.end})'\n+ ... | de5ff68943c10ce3078d38cc7af106696ca25ea2 | diff --git a/core/dbt/clients/_jinja_blocks.py b/core/dbt/clients/_jinja_blocks.py
index 8d9ce891bdc..436e8ccda22 100644
--- a/core/dbt/clients/_jinja_blocks.py
+++ b/core/dbt/clients/_jinja_blocks.py
@@ -356,10 +356,11 @@ def find_blocks(self, allowed_blocks=None, collect_raw_data=True):
self.current ... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-2060@80c9e62 | dbt-labs/dbt-core | Python | 2,060 | Add logging for a file path that can't be cleaned | Closes https://github.com/fishtown-analytics/dbt/issues/2059
In a case where your `dbt_project.yml` file has:
```
source-paths: ["models"]
clean-targets:
- "models"
- "dbt_modules"
```
when you run `dbt clean` you'll see a message that looks like:
```
Checking models/*
Checking dbt_modules/*
Cl... | 2020-01-18T20:44:26Z | If you have a protected path in your clean targets, log that the file can't be cleaned.
### Describe the feature
If I run `dbt clean` the output indicates that a file is checked and then that a file is cleaned. If it cannot clean the file, it doesn't indicate that way.
I propose adding a simple message that says `[... | [
{
"body": "### Describe the feature\r\nIf I run `dbt clean` the output indicates that a file is checked and then that a file is cleaned. If it cannot clean the file, it doesn't indicate that way. \r\nI propose adding a simple message that says `[file] can't be cleaned`\r\n\r\n### Describe alternatives you've co... | 66a4f76c74b8b19ff1d438f76f3a9936b4468f0b | {
"head_commit": "80c9e623ef4cdb1f608c83bd8c7400968e328400",
"head_commit_message": "add logging for a file path that can't be cleaned",
"patch_to_review": "diff --git a/core/dbt/task/clean.py b/core/dbt/task/clean.py\nindex ad4c3d1edaf..ee4a690a071 100644\n--- a/core/dbt/task/clean.py\n+++ b/core/dbt/task/clean... | [
{
"diff_hunk": "@@ -35,4 +35,6 @@ def run(self):\n if not self.__is_protected_path(path):\n shutil.rmtree(path, True)\n logger.info(\" Cleaned {}/*\".format(path))\n+ else:\n+ logger.info(\"{}/* cannot be cleaned\".format(path))",
"line":... | 199b1ed1dc16fbac8b6d5cfa96f53d38ed00d9c6 | diff --git a/core/dbt/task/clean.py b/core/dbt/task/clean.py
index ad4c3d1edaf..513b949ee89 100644
--- a/core/dbt/task/clean.py
+++ b/core/dbt/task/clean.py
@@ -21,7 +21,7 @@ def __is_protected_path(self, path):
abs_path = os.path.abspath(path)
protected_paths = self.config.source_paths + \
... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-2200@367eff7 | dbt-labs/dbt-core | Python | 2,200 | Fix missing sql_header for incremental models | resolves #2136
### Description
This PR adds support for injecting a `sql_header` above `merge` statements generated for incremental models.
### Checklist
- [x] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
- [x] I have run this code in development and it appears to re... | 2020-03-12T19:57:57Z | set_sql_header works well with 'table', but not 'incremental'
### Describe the bug
This test fails when you change 'table' for 'incremental':
test/integration/022_bigquery_test/models/sql_header_model.sql
### Steps To Reproduce
1. Change 'table' to 'incremental' in sql_header_model.sql
2. `dbt run` works wel... | Thanks for the report @fhoffa - we'll check it out! | [
{
"body": "### Describe the bug\r\nThis test fails when you change 'table' for 'incremental':\r\n\r\ntest/integration/022_bigquery_test/models/sql_header_model.sql\r\n\r\n### Steps To Reproduce\r\n\r\n1. Change 'table' to 'incremental' in sql_header_model.sql\r\n2. `dbt run` works well the first time (creates t... | 6e1665d1fba48246afc5f6353cf9e5f5eb2cea1c | {
"head_commit": "367eff77fcfd0c4facb213cfabdc416de2d3e90b",
"head_commit_message": "(#2136) Fix missing sql_header for incremental models",
"patch_to_review": "diff --git a/core/dbt/include/global_project/macros/materializations/common/merge.sql b/core/dbt/include/global_project/macros/materializations/common/me... | [
{
"diff_hunk": "@@ -87,6 +90,9 @@\n {% macro default__get_insert_overwrite_merge_sql(target, source, dest_columns, predicates) -%}\n {%- set predicates = [] if predicates is none else [] + predicates -%}\n {%- set dest_cols_csv = get_quoted_csv(dest_columns | map(attribute=\"name\")) -%}\n+ {%- set s... | f3d4377fddfe8ec3be73440f050e3ad5ef5a0e8e | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37e18e2242b..869464ac31c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
- On `run_cli` API calls that are passed `--vars` differing from the server's `--vars`, the RPC server rebuilds the manifest for that call. ([#2265](https://github.com/fishtown-analyti... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-2037@c1af3ab | dbt-labs/dbt-core | Python | 2,037 | Feature: faster snowflake catalogs (#2009) | (Tentatively) fix #2009
- Thread catalog queries across information schemas
- the `get_catalog` macro now takes an information schema and a list of schemas in that information schema
- filtering happens in the database instead of in python
To be honest, I'm not totally sure about the bigquery impact of these c... | 2020-01-09T21:11:06Z | Reduce memory consumption in docs generation
### Describe the feature
The `dbt docs generate` command fetches all of the columns in all of the source and target schemas touched by dbt. As such, even moderately sized dbt projects can have catalogs containing hundreds of thousands of columns. In practice, we see that th... | [
{
"body": "### Describe the feature\r\nThe `dbt docs generate` command fetches all of the columns in all of the source and target schemas touched by dbt. As such, even moderately sized dbt projects can have catalogs containing hundreds of thousands of columns. In practice, we see that the `dbt docs generate` co... | ccab27a1e2dbafb220d98b858123a897417751b7 | {
"head_commit": "c1af3abbdcd05f3ceac86e5b162e2c594302d817",
"head_commit_message": "PR feedback w/ improved catalog results behavior",
"patch_to_review": "diff --git a/core/dbt/adapters/base/impl.py b/core/dbt/adapters/base/impl.py\nindex 297713e2c7b..5129d60d646 100644\n--- a/core/dbt/adapters/base/impl.py\n+++... | [
{
"diff_hunk": "@@ -1009,29 +1012,56 @@ def _catalog_filter_table(\n \"\"\"\n return table.where(_catalog_filter_schemas(manifest))\n \n- def _get_catalog_information_schemas(\n- self, manifest: Manifest\n- ) -> List[InformationSchema]:\n- return list(self._get_cache_schemas(... | 04bc2a800ad5aea519d7965308cc1510d0c73770 | diff --git a/core/dbt/adapters/base/impl.py b/core/dbt/adapters/base/impl.py
index 297713e2c7b..41c29c53853 100644
--- a/core/dbt/adapters/base/impl.py
+++ b/core/dbt/adapters/base/impl.py
@@ -1,4 +1,6 @@
import abc
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from concurrent.futures import Future... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Performance Optimizations"
} | |
dbt-labs__dbt-core-1934@905f634 | dbt-labs/dbt-core | Python | 1,934 | Fix for broken catalog generation on pg/redshift | Fixes #1926
Some recent updates to how the BigQuery information schema is handled changed the corresponding logic for Postgres & Redshift. dbt previously generated multiple `information schema` objects, _one for each pair of schema and database_, then used them to generate a catalog. Since pg/redshift do not allow ... | 2019-11-18T21:44:04Z | [LMA Regression] redshift get_catalog requires exactly one database
### Describe the bug
Users are seeing the `redshift get_catalog requires exactly one database` error on dbt v0.15.0-rc1 even though they only have a single database specified in their project.
### Steps To Reproduce
Exact reproduction case tbd | [
{
"body": "### Describe the bug\r\nUsers are seeing the `redshift get_catalog requires exactly one database` error on dbt v0.15.0-rc1 even though they only have a single database specified in their project.\r\n\r\n### Steps To Reproduce\r\nExact reproduction case tbd",
"number": 1926,
"title": "[LMA Reg... | 2d6fc280fe2d88882367a35b9c8922d141a3f0cb | {
"head_commit": "905f6347814313ec9730bc77b3099c834ba5511d",
"head_commit_message": "(#1926) Fix for broken catalog generation on pg/redshift",
"patch_to_review": "diff --git a/core/dbt/adapters/base/relation.py b/core/dbt/adapters/base/relation.py\nindex d429fb7f30b..957ac380274 100644\n--- a/core/dbt/adapters/b... | [
{
"diff_hunk": "@@ -1,6 +1,7 @@\n \n {% macro redshift__get_base_catalog(information_schemas) -%}\n {%- call statement('base_catalog', fetch_result=True) -%}\n+ {{ log(information_schemas, info=true) }}",
"line": null,
"original_line": 4,
"original_start_line": null,
"path": "plugins/redshi... | 5c723bf92df34bc9b723dcd265523900bf741106 | diff --git a/core/dbt/adapters/base/relation.py b/core/dbt/adapters/base/relation.py
index d429fb7f30b..957ac380274 100644
--- a/core/dbt/adapters/base/relation.py
+++ b/core/dbt/adapters/base/relation.py
@@ -246,7 +246,10 @@ def information_schema(self, view_name=None) -> 'InformationSchema':
if not isinstanc... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-1900@f1f14d2 | dbt-labs/dbt-core | Python | 1,900 | log hook info in json logs (#1890) | Fixes #1890
```json
{
"json_only": true,
"node_started_at": "2019-11-07T18:30:21.727439",
"node_name": "minimal-on-run-start-1",
"resource_type": "operation",
"node_index": 2,
"unique_id": "operation.minimal.minimal-on-run-start-1",
"run_state": "internal"
}
```
completion:
```json
{
... | 2019-11-07T18:38:50Z | Include node_ information for on-run-start/end hooks in structured logging
### Describe the feature
The dbt server should included structured logging information to help treat on-run-start and on-run-end hooks more like "nodes" in a given run. In or around the hook `START` line, the following fields should be rendered... | [
{
"body": "### Describe the feature\r\nThe dbt server should included structured logging information to help treat on-run-start and on-run-end hooks more like \"nodes\" in a given run. In or around the hook `START` line, the following fields should be rendered into the structured log messages:\r\n```\r\n - \"no... | 6198584f7de7ba042b78dff7ef18be01d8880494 | {
"head_commit": "f1f14d237ef6dcf0adaeeaf579ddedd05cdde45c",
"head_commit_message": "log hook info in json logs",
"patch_to_review": "diff --git a/core/dbt/logger.py b/core/dbt/logger.py\nindex 10d972373de..abab3e5df02 100644\n--- a/core/dbt/logger.py\n+++ b/core/dbt/logger.py\n@@ -265,31 +265,55 @@ def process(s... | [
{
"diff_hunk": "@@ -265,31 +265,55 @@ def process(self, record):\n record.extra['node_count'] = self.node_count\n \n \n-class NodeMetadata(logbook.Processor):\n- def __init__(self, node, node_index):\n- self.node = node\n- self.node_index = node_index\n+class ModelMetadata(logbook.Proce... | b9b4ce30e8a960056e11e81d97d582541b2acf05 | diff --git a/core/dbt/logger.py b/core/dbt/logger.py
index 10d972373de..9343a0c631e 100644
--- a/core/dbt/logger.py
+++ b/core/dbt/logger.py
@@ -266,30 +266,54 @@ def process(self, record):
class NodeMetadata(logbook.Processor):
- def __init__(self, node, node_index):
+ def __init__(self, node, index):
... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-1795@15c2619 | dbt-labs/dbt-core | Python | 1,795 | (#1576) use the information schema on BigQuery | Fixes #1576
Work in progress. Use the BigQuery `INFORMATION_SCHEMA` to fetch the catalog. I actually cheat here and use `__TABLES__` (not `INFORMATION_SCHEMA.TABLES`) because the information in `__TABLES__` is a superset of the data in `TABLES` (ie. `row_count` and `size_bytes`).
Couple of things to verify here:... | 2019-09-29T17:49:37Z | Generating docs take and long time
When running `dbt docs generate` is take over 10 mins to complete and uses lots of CPU resources producing the catalog.
When running with debug turned on the following gets written out:
```
2019-06-20 16:57:55,546 (MainThread): On "<None>": cache miss for schema "my_project.my_... | Thanks for the report @whittid4 - we'll check it out! My initial thinking:
- high cpu usage sounds like an `agate` problem? I recall this being an issue with seeds, but not sure if that's exactly what's happening here
- we're probably iterating over the individual date shards, which is probably undersirable
I have ru... | [
{
"body": "When running `dbt docs generate` is take over 10 mins to complete and uses lots of CPU resources producing the catalog.\r\n\r\nWhen running with debug turned on the following gets written out:\r\n\r\n```\r\n2019-06-20 16:57:55,546 (MainThread): On \"<None>\": cache miss for schema \"my_project.my_dat... | 6287d6d30b0295be5625645c0bedf8e4c9c32ecd | {
"head_commit": "15c26192e853ac89605159552460330383405195",
"head_commit_message": "Include Location field in catalog from the SCHEMATA table",
"patch_to_review": "diff --git a/plugins/bigquery/dbt/adapters/bigquery/impl.py b/plugins/bigquery/dbt/adapters/bigquery/impl.py\nindex 596aff2a66c..5ca6c2e570f 100644\n... | [
{
"diff_hunk": "@@ -387,127 +388,31 @@ def load_dataframe(self, database, schema, table_name, agate_table,\n with self.connections.exception_handler(\"LOAD TABLE\"):\n self.poll_until_job_completes(job, timeout)\n \n- ###\n- # The get_catalog implementation for bigquery\n- ###\n- ... | f757a08a992df379822f16093428cb8c31aeef53 | diff --git a/plugins/bigquery/dbt/adapters/bigquery/impl.py b/plugins/bigquery/dbt/adapters/bigquery/impl.py
index 596aff2a66c..ae34b2a7c65 100644
--- a/plugins/bigquery/dbt/adapters/bigquery/impl.py
+++ b/plugins/bigquery/dbt/adapters/bigquery/impl.py
@@ -1,5 +1,3 @@
-import copy
-
import dbt.deprecations
import dbt... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Performance Optimizations"
} |
dbt-labs__dbt-core-1878@1b4c763 | dbt-labs/dbt-core | Python | 1,878 | add run-operation + snapshot to the RPC server (#1875) | Fixes #1875
`snapshot` + `run-operation` support.
`run-operation`:
In addition to the defaults of 'task_tags' and 'timeout' there are 2 parameters:
- macro: str (required)
- args: Dict[str, Any] (optional)
As in the CLI version, run operations return a `success` boolean that indicates whether th... | 2019-10-30T20:31:20Z | Support run-operation and snapshot methods in rpc server
### Describe the feature
The rpc server should support the `run_operation` and `snapshot` methods. Additionally, the `cli_args` method should support running operations and snapshots using the CLI syntax.
### Methods
*run-operation*:
- args
*snapshot*:... | [
{
"body": "### Describe the feature\r\nThe rpc server should support the `run_operation` and `snapshot` methods. Additionally, the `cli_args` method should support running operations and snapshots using the CLI syntax.\r\n\r\n### Methods\r\n\r\n*run-operation*:\r\n- args\r\n\r\n*snapshot*:\r\n - select\r\n - ex... | 8239f9c4e30641aee669a51ee325b0a384b54f9e | {
"head_commit": "1b4c76365c15b73ac054e269f21a78843173c44a",
"head_commit_message": "add run_operation + snapshot to the RPC server",
"patch_to_review": "diff --git a/core/dbt/contracts/rpc.py b/core/dbt/contracts/rpc.py\nindex 226d8982aad..8c5aed779a9 100644\n--- a/core/dbt/contracts/rpc.py\n+++ b/core/dbt/contr... | [
{
"diff_hunk": "@@ -97,3 +101,40 @@ def get_catalog_results(\n _compile_results=compile_results,\n logs=[],\n )\n+\n+\n+class RemoteRunOperationTask(\n+ RPCTask[RPCRunOperationParameters],\n+ HasCLI[RPCRunOperationParameters, RemoteRunOperationResult],\n+ RunOperationTas... | 658be46831e15c41925f3c0bb52b6f44f99e2dbe | diff --git a/core/dbt/contracts/rpc.py b/core/dbt/contracts/rpc.py
index 226d8982aad..39566fe0d93 100644
--- a/core/dbt/contracts/rpc.py
+++ b/core/dbt/contracts/rpc.py
@@ -45,6 +45,12 @@ class RPCCompileParameters(RPCParameters):
exclude: Union[None, str, List[str]] = None
+@dataclass
+class RPCSnapshotParame... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-1788@a227b31 | dbt-labs/dbt-core | Python | 1,788 | Add runtime per-model warehouse config on snowflake models (#1358) | Fixes #1358
- Add warehouse config to snowflake
- Add concept of adapter-level pre/post model hooks
- Use those hooks to optionally set a warehouse on a per-model basis in snowflake
- Added some silly integration tests
- one tests that the warehouse is applied by setting a bad one and failing
- one that te... | 2019-09-27T15:13:25Z | Snowflake: Enable choosing a warehouse at runtime
### Feature description
There are cases where you want a set of models in your project to run on a different Snowflake warehouse so that it completes more quickly. Right now you can do that with hacks involving multiple profiles or environment variables across multip... | @cmcarthur, another approach to do this would be to use a pre-hook with a USE WAREHOUSE query_wh; | [
{
"body": "### Feature description\r\n\r\nThere are cases where you want a set of models in your project to run on a different Snowflake warehouse so that it completes more quickly. Right now you can do that with hacks involving multiple profiles or environment variables across multiple runs, but it would be ea... | 78a199f94643a47e4ca28696ad1ec7a616a4abbe | {
"head_commit": "a227b311623c2475f0ad4ae918120461fa307e1f",
"head_commit_message": "Add runtime per-model warehouse config on snowflake models\n\nAdd warehouse config to snowflake\nAdd concept of adapter-level pre/post model hooks\nUse those hooks to optionally set a warehouse on a per-model basis\nAdded some inte... | [
{
"diff_hunk": "@@ -40,3 +43,40 @@ def _make_match_kwargs(self, database, schema, identifier):\n return filter_null_values(\n {\"identifier\": identifier, \"schema\": schema, \"database\": database}\n )\n+\n+ def _get_warehouse(self) -> str:\n+ _, table = self.execute(\n+ ... | 52f62430f4a407eb7371b523efa41ca59cbe447e | diff --git a/core/dbt/adapters/base/impl.py b/core/dbt/adapters/base/impl.py
index 93208be858b..3971a75b145 100644
--- a/core/dbt/adapters/base/impl.py
+++ b/core/dbt/adapters/base/impl.py
@@ -2,7 +2,8 @@
from contextlib import contextmanager
from datetime import datetime
from typing import (
- Optional, Tuple, C... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-1851@bcd9534 | dbt-labs/dbt-core | Python | 1,851 | Add a configuration option `kms_key_name` to dbt_project.yml for BigQ… | …uery projects where a Cloud KMS key can be specified and used to encrypt models. The key is specified to bigquery in the ddl OPTIONS.
ex.
```
models:
fishtown_analytics:
kms_key_name: 'projects/PROJECT_ID/locations/global/keyRings/test/cryptoKeys/quickstart'
my_model:
kms_key_name: none ... | 2019-10-22T20:38:43Z | Support KMS encryption for BigQuery
### Describe the feature
Allow for KMS encryption to be specified in project configuration. Ideally this would be done in dbt_projects.yml like:
```name: fishtown_analytics
models:
fishtown_analytics:
kms_key_name: 'some_kms_key'
events:
kms_key_name: 'some... | Really neat idea @kconvey!
It looks to me like a `kms_key_name` option can be provided to a `create table as` statement in BigQuery. That would be a good mechanism for dbt to use here I think.
It appears to me that the `kms_key_name` will also need to be supplied when _querying_ this data too. I think that might ... | [
{
"body": "### Describe the feature\r\nAllow for KMS encryption to be specified in project configuration. Ideally this would be done in dbt_projects.yml like:\r\n```name: fishtown_analytics\r\n\r\nmodels:\r\n fishtown_analytics:\r\n kms_key_name: 'some_kms_key'\r\n \r\n events:\r\n kms_key_name: 'som... | 1f1d10033f63744c849123fb00fab36080b36070 | {
"head_commit": "bcd953490d0c83f92da0e6b0b88a4d6130972262",
"head_commit_message": "Add a configuration option `kms_key_name` to dbt_project.yml for BigQuery\nprojects where a Cloud KMS key can be specified and used to encrypt\nmodels. The key is specified to bigquery in the ddl OPTIONS.",
"patch_to_review": "di... | [
{
"diff_hunk": "@@ -36,24 +36,25 @@\n {% if temporary %}\n {% do opts.update({'expiration_timestamp': 'TIMESTAMP_ADD(CURRENT_TIMESTAMP(), INTERVAL 12 hour)'}) %}\n {% endif %}\n+ {% if kms_key_name %}\n+ {% do opts.update({'kms_key_name': \"'\" ~ kms_key_name ~ \"'\"}) %}\n+ {% endif %}\n \n- {% s... | 83de6b16177082260a425ad78d6ad6a4116f11b5 | diff --git a/plugins/bigquery/dbt/adapters/bigquery/impl.py b/plugins/bigquery/dbt/adapters/bigquery/impl.py
index 648cf2a87e0..5f8027cd86f 100644
--- a/plugins/bigquery/dbt/adapters/bigquery/impl.py
+++ b/plugins/bigquery/dbt/adapters/bigquery/impl.py
@@ -48,7 +48,8 @@ class BigQueryAdapter(BaseAdapter):
Column =... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-1615@1a4daab | dbt-labs/dbt-core | Python | 1,615 | Make node selection O(n) | Fixes #1611
The culprit was `get_ancestor_ephemeral_nodes`, which looked at the set of all selected models and then asked for all ancestors of each... if you select all your models, that means for each model we will go through all models. Oops!
This fix is kind of a hack, but it just adds all ephemeral nodes to ... | 2019-07-17T16:47:02Z | Node selection is quadratic in running time
## Issue
The node selection algorithm is pretty obviously quadratic in running time and probably shouldn't be.
### Issue description
In particular, we make N^2+N calls to `is_selected_node`, where N is the number of nodes in the graph. At smallish numbers of nodes (~100-... | [
{
"body": "## Issue\r\nThe node selection algorithm is pretty obviously quadratic in running time and probably shouldn't be.\r\n\r\n### Issue description\r\nIn particular, we make N^2+N calls to `is_selected_node`, where N is the number of nodes in the graph. At smallish numbers of nodes (~100-200) that's no bi... | 5a1f0bdda574022ef0ed3e93b5f94257b928d653 | {
"head_commit": "1a4daaba106f4b49daa43c93a8ae8eb4a7b8313a",
"head_commit_message": "That was the last reference to to_flat_graph, so goodbye to all that",
"patch_to_review": "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 08dcbe0e13d..72596c838c0 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,3 +1,8 @@\n... | [
{
"diff_hunk": "@@ -398,8 +398,6 @@ def generate_base(model, model_dict, config, manifest, source_config,\n \"exceptions\": dbt.exceptions.wrapped_exports(model),\n \"execute\": provider.execute,\n \"flags\": dbt.flags,\n- # TODO: Do we have to leave this in?",
"line": 401,
... | 0648737fc1b8493dc86ce64feae8fd8747853b70 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08dcbe0e13d..dea5d399d50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## dbt 0.14.1
+
+### Breaking changes
+ - the undocumented "graph" variable's "macros" field was removed from the parsing context ([#1615](https://github.com/fishtown-analytics/dbt/pull/... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Performance Optimizations"
} | |
dbt-labs__dbt-core-1550@92ef783 | dbt-labs/dbt-core | Python | 1,550 | clean up block parsing to make it dumber and more effective (#1547) | Fixes #1547
The block parser is now two-tiered: one part extracts tags `{% x %}` and is pretty purely linear, and one part tries to make sense out of begin/end sequencing and maintains a stack. I think this version is much more maintainable and readable, and I feel way more confident releasing this. The diff is pre... | 2019-06-18T16:44:52Z | Tell the block parser to ignore tags/nesting by default
## Feature
Replace recursive block parsing with extracting a flat list of tags and some metadata (position, block type/name)
### Feature description
The block parser currently has a list of special tags that don't/might not have a matching `{% endtag %}`, and... | [
{
"body": "## Feature\r\nReplace recursive block parsing with extracting a flat list of tags and some metadata (position, block type/name)\r\n\r\n### Feature description\r\nThe block parser currently has a list of special tags that don't/might not have a matching `{% endtag %}`, and recursively descends into bl... | 85164b616e3682a7bd476dd401344c1834aa5fee | {
"head_commit": "92ef7839481f091f1d91c93131cd48134c52b036",
"head_commit_message": "clean up block parsing to make it dumber and more effective",
"patch_to_review": "diff --git a/core/dbt/clients/_jinja_blocks.py b/core/dbt/clients/_jinja_blocks.py\nindex a0e567e0ca2..766b451a57d 100644\n--- a/core/dbt/clients/_... | [
{
"diff_hunk": "@@ -354,5 +354,7 @@ def undefined_error(msg):\n raise jinja2.exceptions.UndefinedError(msg)\n \n \n-def extract_toplevel_blocks(data):\n- return BlockIterator(data).lex_for_blocks()\n+def extract_toplevel_blocks(data, allowed=None, collect_raw_data=True):\n+ bi = BlockIterator(data)\n+... | 18953536f1db8bdd1846f43fcc47e967bf49ae44 | diff --git a/core/dbt/clients/_jinja_blocks.py b/core/dbt/clients/_jinja_blocks.py
index a0e567e0ca2..d5f4f33ab7f 100644
--- a/core/dbt/clients/_jinja_blocks.py
+++ b/core/dbt/clients/_jinja_blocks.py
@@ -1,4 +1,5 @@
import re
+from collections import namedtuple
import dbt.exceptions
@@ -45,6 +46,9 @@ def end_pat... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-1453@70206b1 | dbt-labs/dbt-core | Python | 1,453 | Warn on unpinned git packages (#1446) | Fixes #1446
This fails the run in strict mode and logs a warning otherwise.
With no repository set and no value for `warn-unpinned`:
```
$ cat packages.yml
packages:
- git: "https://github.com/fishtown-analytics/dbt-utils"
$ dbt deps
Running with dbt=0.13.0
WARNING: Version for https://github.com/fishtow... | 2019-05-10T02:34:44Z | Warn for packages that are not pinned to a specific version
## Feature
### Feature description
When we make breaking changes to repos like `dbt-utils`, we invariably break _someone's_ project. This happens when people 1) don't specify a version/revision for their package or 2) specify something overly broad, like `... | [
{
"body": "## Feature\r\n\r\n### Feature description\r\nWhen we make breaking changes to repos like `dbt-utils`, we invariably break _someone's_ project. This happens when people 1) don't specify a version/revision for their package or 2) specify something overly broad, like `master`.\r\n\r\nWhile this is prett... | cc8ef4774798059b4a0ee4364b6944a487b2fa6b | {
"head_commit": "70206b16355fa786b880ceef88d31cbb6d14e5fc",
"head_commit_message": "warn on unpinned dependencies, unless warn-unpinned: False is set in packages.yml",
"patch_to_review": "diff --git a/core/dbt/contracts/project.py b/core/dbt/contracts/project.py\nindex 9e79101f52a..3bda33e2500 100644\n--- a/core... | [
{
"diff_hunk": "@@ -252,8 +255,12 @@ def nice_version_name(self):\n return \"revision {}\".format(self.version_name())\n \n def incorporate(self, other):\n+ # if one is True, make both be True.\n+ warn_unpinned = self.warn_unpinned and other.warn_unpinned",
"line": 260,
"origin... | ea8825996d56f89a644a201fc2436e6de83ce6b6 | diff --git a/core/dbt/contracts/project.py b/core/dbt/contracts/project.py
index 9e79101f52a..3bda33e2500 100644
--- a/core/dbt/contracts/project.py
+++ b/core/dbt/contracts/project.py
@@ -188,6 +188,9 @@ class Project(APIObject):
'items': {'type': 'string'},
'description': 'The git revision t... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} | |
dbt-labs__dbt-core-1452@d74e37d | dbt-labs/dbt-core | Python | 1,452 | Handle seeds with utf-8 BOM (#1177) | Fixes #1177
Instead of passing agate a filepath, open the file at that path, look at the first byte, and seek back if it's not a BOM. Regardless, pass the file handle to agate instead.
That way when agate gets the file handle, if there is a BOM, it won't see it. | 2019-05-10T00:01:58Z | Strip BOM from Excel-generated UTF-8 CSV files
## Issue
UTF-8 CSV files generated by Excel have a byte order mark (BOM) which is included in the column title when using `dbt seed`.
### Issue description
Save Excel file as UTF-8 CSV on Microsoft Excel for Mac. Run `dbt seed` on the resulting file.
### Result... | I (fortunately) don't have an excel-generated csv lying around to test this on, but had written down some notes about this before.
I *think* the following enables you to read excel-generated csv files as expected, for what it's worth:
```
>>> import codecs
>>> import csv
>>> with codecs.open('excel_output.csv'... | [
{
"body": "## Issue\r\n\r\nUTF-8 CSV files generated by Excel have a byte order mark (BOM) which is included in the column title when using `dbt seed`.\r\n\r\n### Issue description\r\n\r\nSave Excel file as UTF-8 CSV on Microsoft Excel for Mac. Run `dbt seed` on the resulting file.\r\n\r\n### Results\r\n\r\nThe... | cc8ef4774798059b4a0ee4364b6944a487b2fa6b | {
"head_commit": "d74e37d4ea6f5cc588fa102f7003f0978ed4cf8f",
"head_commit_message": "Always specify encodings to open()\n\nFixes some neat windows behavior where the default code page can be cp1252\nAdd BOM unit test",
"patch_to_review": "diff --git a/core/dbt/clients/agate_helper.py b/core/dbt/clients/agate_help... | [
{
"diff_hunk": "@@ -41,4 +42,7 @@ def as_matrix(table):\n \n \n def from_csv(abspath):\n- return agate.Table.from_csv(abspath, column_types=DEFAULT_TYPE_TESTER)\n+ with dbt.compat.open_file(abspath) as fp:\n+ if fp.read(1) != u'\\ufeff':",
"line": null,
"original_line": 46,
"original_st... | 26427d2af025f51cab52086a85666fb24ba86744 | diff --git a/core/dbt/clients/agate_helper.py b/core/dbt/clients/agate_helper.py
index e08c500f485..446056a5e8f 100644
--- a/core/dbt/clients/agate_helper.py
+++ b/core/dbt/clients/agate_helper.py
@@ -1,6 +1,11 @@
+from codecs import BOM_UTF8
+
+import dbt.compat
import agate
+BOM = BOM_UTF8.decode('utf-8') # '\u... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dbt-labs__dbt-core-1406@4730789 | dbt-labs/dbt-core | Python | 1,406 | Fix run operation return codes (#1377) | Fixes #1377
When we run an operation, set the return code on error.
Also, since wilt-chamberlain totally broke the run-operation command in multiple ways, I fixed all that. And added tests so I don't do that again.
I also added a commit call that happens after successfully executing the macro. Maybe that woul... | 2019-04-17T17:30:00Z | Fail with nonzero exit code if run-operation task encounters an unhandled exception
## Issue
### Issue description
If a run-operation macro fails with an exception (ie. unable to connect to database, invalid SQL, etc), dbt should exit with a nonzero exit code. Moreover, run-operations should generally go through a ... | [
{
"body": "## Issue\r\n\r\n### Issue description\r\nIf a run-operation macro fails with an exception (ie. unable to connect to database, invalid SQL, etc), dbt should exit with a nonzero exit code. Moreover, run-operations should generally go through a similar code-path to models, seeds, etc, such that this hap... | 4dd80567e15580079b6b72cf6ea9eed46c9b5953 | {
"head_commit": "473078986ca7905190bbf20ec3422e24e3d56c20",
"head_commit_message": "PR feedback: run_unsafe -> _run_unsafe",
"patch_to_review": "diff --git a/core/dbt/task/run_operation.py b/core/dbt/task/run_operation.py\nindex 6ea5d91bd98..10fe0b1e04a 100644\n--- a/core/dbt/task/run_operation.py\n+++ b/core/db... | [
{
"diff_hunk": "@@ -22,19 +21,44 @@ def _get_macro_parts(self):\n def _get_kwargs(self):\n return dbt.utils.parse_cli_vars(self.args.args)\n \n- def run(self):\n+ def _run_unsafe(self):\n manifest = GraphLoader.load_all(self.config)\n adapter = get_adapter(self.config)\n \n ... | ca02a5851918bf0325b9b3688b4abadf5e1cf5df | diff --git a/core/dbt/task/run_operation.py b/core/dbt/task/run_operation.py
index 6ea5d91bd98..fe90649d1e0 100644
--- a/core/dbt/task/run_operation.py
+++ b/core/dbt/task/run_operation.py
@@ -1,6 +1,5 @@
from dbt.logger import GLOBAL_LOGGER as logger
-
-from dbt.task.base import BaseTask
+from dbt.task.base import Co... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-1436@e043643 | dbt-labs/dbt-core | Python | 1,436 | dbt ls command (#467) | Fixes #467
One change I had to make: the `original_file_path` now points at the actual original file path, rather than a weird combination of the compiled path + the root of the search that sometimes doesn't exist. Models and such retained their original correct paths.
| 2019-05-01T20:59:02Z | new command: dbt ls
List models selected by CLI args. Eg.
```
$ dbt ls --models salesforce.* --exclude salesforce_accounts
models/salesforce/salesforce_users.sql
models/salesforce/salesforce_contacts.sql
models/salesforce/salesforce_leads.sql
....
```
This will be especially valuable when dbt supports selec... | I think I'd prefer the command to be `list` as opposed to `ls`, and for it to just return the model names.
```
$ dbt list --models salesforce.* --exclude salesforce_accounts
salesforce_users
salesforce_contacts
salesforce_leads
....
```
Maybe it could have a flag like `--verbose` that shows the fqn versions:
... | [
{
"body": "List models selected by CLI args. Eg.\r\n\r\n```\r\n$ dbt ls --models salesforce.* --exclude salesforce_accounts\r\nmodels/salesforce/salesforce_users.sql\r\nmodels/salesforce/salesforce_contacts.sql\r\nmodels/salesforce/salesforce_leads.sql\r\n....\r\n```\r\n\r\nThis will be especially valuable when... | 3c8bbddb5f03f4009722ce83568b936652926bd2 | {
"head_commit": "e043643a54b5912cfaf06b9e1a272571454b7327",
"head_commit_message": "Add a new ListTask, and 'dbt list'/'dbt ls'\n\nAll tasks now have a 'pre_init_hook' classmethod, called by main\n - runs after args are parsed, before anything else",
"patch_to_review": "diff --git a/core/dbt/logger.py b/core/dbt... | [
{
"diff_hunk": "@@ -569,6 +571,42 @@ def _build_rpc_subparser(subparsers, base_subparser):\n return sub\n \n \n+def _build_list_subparser(subparsers, base_subparser):\n+ sub = subparsers.add_parser(\n+ 'list',\n+ parents=[base_subparser],\n+ help='list models'\n+ )\n+ sub.set_d... | 8e426e60c9b6d40425b805ebe2d10ce9d522a285 | diff --git a/core/dbt/logger.py b/core/dbt/logger.py
index f658769172f..7ec7426c619 100644
--- a/core/dbt/logger.py
+++ b/core/dbt/logger.py
@@ -50,6 +50,11 @@ def notice(self, msg, *args, **kwargs):
stdout_handler.setFormatter(logging.Formatter('%(message)s'))
stdout_handler.setLevel(NOTICE)
+stderr_handler = logg... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-1440@ec8277b | dbt-labs/dbt-core | Python | 1,440 | Output run hooks (#696) | Fixes #696
Output information about the on-run-start and on-run-end hooks before and after running dbt.
One wrinkle, the output isn't exactly as described in the issue - it's a bit tricky to move that `Concurrency` line before hooks run. Instead you get this order.
```
Running with dbt=0.13.0
Found 163 macr... | 2019-05-03T15:08:33Z | show on-run-start/end + hooks in dbt output
### Feature
dbt doesn't output any info about the start/end hooks that it runs, so it can be hard to understand why the stdout seems to stall. Instead, dbt should log the start/end hooks that it is running to the console.
Example:
```
$ dbt run
Found 3 models, 2 te... | I'd like to take a stab at this.
Cool @vijaykiran! Let me know if there's anything I can do to help out when you give it a shot :)
This looks good | [
{
"body": "### Feature\r\n\r\ndbt doesn't output any info about the start/end hooks that it runs, so it can be hard to understand why the stdout seems to stall. Instead, dbt should log the start/end hooks that it is running to the console.\r\n\r\nExample:\r\n```\r\n$ dbt run\r\n\r\nFound 3 models, 2 tests, 0 ar... | 3c8bbddb5f03f4009722ce83568b936652926bd2 | {
"head_commit": "ec8277b0e46654d6db18f99e26157af1440ac1e9",
"head_commit_message": "add color to hooks, give hooks names",
"patch_to_review": "diff --git a/core/dbt/logger.py b/core/dbt/logger.py\nindex f658769172f..9840d8c8fc8 100644\n--- a/core/dbt/logger.py\n+++ b/core/dbt/logger.py\n@@ -67,6 +67,10 @@ def no... | [
{
"diff_hunk": "@@ -33,22 +73,35 @@ def run_hooks(self, adapter, hook_type, extra_context):\n # b/c psycopg2 automatically begins a transaction when a connection\n # is created.\n adapter.clear_transaction()\n+ if not ordered_hooks:\n+ return\n+ num_hooks = len(o... | f6bf8d912a2d8fecf596bbf0f2310cb7c1450b27 | diff --git a/core/dbt/logger.py b/core/dbt/logger.py
index f658769172f..9840d8c8fc8 100644
--- a/core/dbt/logger.py
+++ b/core/dbt/logger.py
@@ -67,6 +67,10 @@ def notice(self, msg, *args, **kwargs):
# provide this for the cache.
CACHE_LOGGER = logging.getLogger('dbt.cache')
+# add a dummy handler to avoid `No hand... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
ccxt__ccxt-20802@980d87f | ccxt/ccxt | Python | 20,802 | fetchOHLCV: switch between current and history candles | Edited how fetchOHLCV switches between history and current candles in the since handling
fixes: #20756
### Test 1 (history candles):
```
const hourInMs = 3600 * 1000;
since = this.milliseconds() - 1439 * hourInMs;
```
```
okx.fetchOHLCV (BTC/USDT, 1h, 1699862134346, 300)
okx GET https://www.okx.com/api/v5/ma... | 2024-01-12T08:06:34Z | Okx fetch_ohlcv candles/history candles automatic switch issue
### Operating System
Windows 10
### Programming Languages
_No response_
### CCXT Version
4.2.9
### Description
Okx states that limit is 300 for live candles, and 100 for history candles
And api may return 1440 live candles
If i quer... | Hey @Alfavisioner I think your question might be answered by the comment in the code snippet you posted:
`# if the since timestamp is more than limit candles back in the past` then the history candles with a limit of 100 are used, based on that I don't think it makes sense to remove limit from calc because then I'm no... | [
{
"body": "### Operating System\r\n\r\nWindows 10\r\n\r\n### Programming Languages\r\n\r\n_No response_\r\n\r\n### CCXT Version\r\n\r\n4.2.9\r\n\r\n### Description\r\n\r\nOkx states that limit is 300 for live candles, and 100 for history candles\r\nAnd api may return 1440 live candles\r\n\r\nIf i query live can... | e34212db9dd6aeff7d652f38f5ce34ddc916f59f | {
"head_commit": "980d87f0e2a78e7d609623b8d4940672163a3697",
"head_commit_message": "fix(fetchOHLCV): switch between current and history candles\n\n```\nconst hourInMs = 3600 * 1000;\nsince = this.milliseconds() - 1440 * hourInMs;\n```\n```\nokx.fetchOHLCV (BTC/USDT, 1h,1699862134346 , 300)\n\nokx GET https://www.o... | [
{
"diff_hunk": "@@ -2146,17 +2146,14 @@ export default class okx extends Exchange {\n let defaultType = 'Candles';\n if (since !== undefined) {\n const now = this.milliseconds ();\n- const difference = now - since;\n const durationInMilliseconds = duration * 10... | 2801dcd43937d6a4afa1f277a4aaa0a8d8be3bda | diff --git a/ts/src/okx.ts b/ts/src/okx.ts
index d66a18cceae37..ae22ef1b9f8b2 100644
--- a/ts/src/okx.ts
+++ b/ts/src/okx.ts
@@ -2146,17 +2146,14 @@ export default class okx extends Exchange {
let defaultType = 'Candles';
if (since !== undefined) {
const now = this.milliseconds ();
- ... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
cookiecutter__cookiecutter-django-4971@bac46de | cookiecutter/cookiecutter-django | Python | 4,971 | Fix `runserver_plus` hot-reload when under Windows + Docker | ## Description
Supporting django auto reload in windows docker.
## Rationale
Now it doesn't reload when django code is changed in windows docker env.
The problem is related to wsl2 and Werkzeug's built-in reloading system.
So it can be fixed with stat polling options.
FIX #4970 | 2024-04-06T02:54:37Z | Why doesn't add RunServerPlus options for reload in windows when using docker?
## Description
What are you proposing? How should it be implemented?
Add this code when window = y when generating project, for reloading django code in window.
```
end of base.py
# RunServerPlus
# -------------------------------... | This would definitely help, can you submit a PR?
> This would definitely help, can you submit a PR?
Yeah. It is honor to me. I will make a pr soon. I hope you review my code. 😀 | [
{
"body": "## Description\r\n\r\nWhat are you proposing? How should it be implemented?\r\n\r\nAdd this code when window = y when generating project, for reloading django code in window.\r\n\r\n```\r\nend of base.py\r\n# RunServerPlus\r\n# -------------------------------------------------------------------------... | 83ceb39b50355d92f0f164b30f2c6fbca5ed36f2 | {
"head_commit": "bac46de67f3a829dc51921660af9a426f483a225",
"head_commit_message": "Add options to reload django when file changes in windows docker",
"patch_to_review": "diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py\nindex f1edb514ba... | [
{
"diff_hunk": "@@ -83,6 +83,15 @@\n # The node container isn't started (yet?)\n pass\n {%- endif %}\n+{% if cookiecutter.windows == 'y' %}\n+# RunServerPlus\n+# ------------------------------------------------------------------------------\n+# After how many seconds auto-reload should scan ... | f4421a81eeeba758f2fd6a0352d2fa04be7aafcb | diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index f1edb514ba..ab526f968c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -83,6 +83,15 @@
# The nod... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "New Feature Additions"
} |
dmlc__dgl-6409@2f57756 | dmlc/dgl | Python | 6,409 | [Sparse]Fix device check | ## Description
Add the device check for sparse operator. When user call the function and the device of input matrix is not the same as input tensor, raise an error.
Resolve #6393.
## Checklist
Please feel free to remove inapplicable items for your PR.
- [ ] The PR title starts with [$CATEGORY] (such as [NN], [... | 2023-10-09T02:21:11Z | [Bug]DGL sparse run error message is incomplete
## 🐛 Bug
<!-- A clear and concise description of what the bug is. -->
DGL sparse run error message is incomplete, make it hard to debug for user.
## To Reproduce
In DGL sparse, the op like bsddmm needs all inputs are on the same device, howerver, if inputs are ... | [
{
"body": "## 🐛 Bug\r\n\r\n<!-- A clear and concise description of what the bug is. -->\r\nDGL sparse run error message is incomplete, make it hard to debug for user.\r\n\r\n## To Reproduce\r\n\r\nIn DGL sparse, the op like bsddmm needs all inputs are on the same device, howerver, if inputs are not on the same... | fdb4737c3517380a8ffd01e743edea231c7570c5 | {
"head_commit": "2f57756c70e70a1b1a7ac69bd58b75a61934a4f7",
"head_commit_message": "add device check in c",
"patch_to_review": "diff --git a/dgl_sparse/src/sddmm.cc b/dgl_sparse/src/sddmm.cc\nindex b32f1640de45..810583e01a99 100644\n--- a/dgl_sparse/src/sddmm.cc\n+++ b/dgl_sparse/src/sddmm.cc\n@@ -61,8 +61,9 @@ ... | [
{
"diff_hunk": "@@ -123,7 +123,6 @@ def spspmm(A: SparseMatrix, B: SparseMatrix) -> SparseMatrix:\n assert isinstance(\n B, SparseMatrix\n ), f\"Expect A2 to be a SparseMatrix object, got {type(B)}.\"\n-",
"line": null,
"original_line": 126,
"original_start_line": null,
"path": "... | b9fd04848c7dbf4e89095f079435d727186455fe | diff --git a/dgl_sparse/src/sddmm.cc b/dgl_sparse/src/sddmm.cc
index b32f1640de45..810583e01a99 100644
--- a/dgl_sparse/src/sddmm.cc
+++ b/dgl_sparse/src/sddmm.cc
@@ -61,8 +61,9 @@ void _SDDMMSanityCheck(
mat1.dtype() == mat2.dtype(),
"SDDMM: the two dense matrices should have the same dtype.");
TORCH_... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} | |
dbt-labs__dbt-core-11020@2cb2c96 | dbt-labs/dbt-core | Python | 11,020 | make microbatch models skippable | Resolves https://github.com/dbt-labs/dbt-core/issues/11021
<!---
Include the number of the issue addressed by this PR above, if applicable.
PRs for code changes without an associated issue *will not be merged*.
See CONTRIBUTING.md for more information.
Add the `user docs` label to this PR if it will ne... | 2024-11-21T16:22:02Z | [Bug] Skipping microbatch model fails with `typeError: object of type 'Field' has no len()`
An upstream failing leads to a microbatch model skipping (but still executing?) with the failure 'Field' has no len():
```
15:47:30 Found 23 models, 6 seeds, 21 data tests, 6 sources, 2 exposures, 13 metrics, 769 macros, 6 ... | [
{
"body": "An upstream failing leads to a microbatch model skipping (but still executing?) with the failure 'Field' has no len():\r\n\r\n```\r\n15:47:30 Found 23 models, 6 seeds, 21 data tests, 6 sources, 2 exposures, 13 metrics, 769 macros, 6 semantic models, 5 unit tests\r\n15:47:30 \r\n15:47:30 Concurrenc... | fd6ec71dabae91f4f243362acbcda6dc1beccec6 | {
"head_commit": "2cb2c96a18735f66e0fbf70d7472fc19c8b14586",
"head_commit_message": "make microbatch models skippable",
"patch_to_review": "diff --git a/core/dbt/task/run.py b/core/dbt/task/run.py\nindex 1b4be463e78..0b991fc9f29 100644\n--- a/core/dbt/task/run.py\n+++ b/core/dbt/task/run.py\n@@ -2,7 +2,7 @@\n imp... | [
{
"diff_hunk": "@@ -335,7 +335,7 @@ def execute(self, model, manifest):\n \n class MicrobatchModelRunner(ModelRunner):\n batch_idx: Optional[int] = None\n- batches: Dict[int, BatchType] = field(default_factory=dict)",
"line": 338,
"original_line": 338,
"original_start_line": null,
"path":... | 052d699ff31651f833a434a352f8247662cc4ac7 | diff --git a/.changes/unreleased/Fixes-20241121-112638.yaml b/.changes/unreleased/Fixes-20241121-112638.yaml
new file mode 100644
index 00000000000..15a23ae8995
--- /dev/null
+++ b/.changes/unreleased/Fixes-20241121-112638.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Make microbatch models skippable
+time: 2024-11-21T11:26... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
dask__dask-7473@4b154b0 | dask/dask | Python | 7,473 | Add ignore_order parameter in dd.concat (#7398) | - Closes #7398
- Tests added / passed
- Passes `black dask` / `flake8 dask`
| 2021-03-26T21:09:50Z | add "ignore_order" parameter for categoricals in dd.concat
it would be handy to have a passthrough parameter to dd.concat - currently the union_categoricals call is parameter-free:
```
dtype = "category"
if left is not None and right is not None:
dtype = union_categoricals(
... | That sounds like a nice addition, thanks for writing it up! If you have time to work on a pull request, that is the best and quickest way to get this feature :)
Can i work on this ?
I see two options -
```
@concat_dispatch.register((pd.DataFrame, pd.Series, pd.Index)) ... | [
{
"body": "it would be handy to have a passthrough parameter to dd.concat - currently the union_categoricals call is parameter-free:\r\n\r\n```\r\n dtype = \"category\"\r\n if left is not None and right is not None:\r\n dtype = union_categoricals(\r\n [left.astyp... | fba94e65e6053163fd1b1ed3c1803ab4f4aa541f | {
"head_commit": "4b154b0740b11e40d4a44f8727798189761fd924",
"head_commit_message": "Add ignore_order parameter in dd.concat (#7398)",
"patch_to_review": "diff --git a/dask/dataframe/methods.py b/dask/dataframe/methods.py\nindex 7c47d443c9a..2798c099c61 100644\n--- a/dask/dataframe/methods.py\n+++ b/dask/datafram... | [
{
"diff_hunk": "@@ -1103,6 +1129,8 @@ def concat(\n ignore_unknown_divisions : bool, default False\n By default a warning is raised if any input has unknown divisions.\n Set to True to disable this warning.\n+ ignore_order : bool, default False\n+ Wether to ignore order when doing ... | d2db289eea9d605e6e5f758ceb80f7ef4bb61303 | diff --git a/dask/dataframe/methods.py b/dask/dataframe/methods.py
index 7c47d443c9a..2798c099c61 100644
--- a/dask/dataframe/methods.py
+++ b/dask/dataframe/methods.py
@@ -398,6 +398,7 @@ def concat(
join="outer",
uniform=False,
filter_warning=True,
+ ignore_order=False,
ignore_index=False,
... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-10989@bd08705 | dbt-labs/dbt-core | Python | 10,989 | fix deprecation firing for microbatch model w custom strategy | Resolves #10994
### Problem
The deprecation about custom microbatch macros was being fired in the wrong instances. It was being fired a custom marcro _wasn't_ present instead of when it _was_ 🫠
### Solution
Negate the conditional check of `self.manifest._microbatch_macro_is_core`
### Checklist
- [X]... | 2024-11-12T20:07:03Z | [Bug] Deprecation warning for custom `microbatch` macros is being fired incorrectly
### Is this a new bug in dbt-core?
- [X] I believe this is a new bug in dbt-core
- [X] I have searched the existing issues, and I could not find an existing issue for this bug
### Current Behavior
A deprecation warning about custom m... | [
{
"body": "### Is this a new bug in dbt-core?\n\n- [X] I believe this is a new bug in dbt-core\n- [X] I have searched the existing issues, and I could not find an existing issue for this bug\n\n### Current Behavior\n\nA deprecation warning about custom microbatch marcos is issued IFF all the following are true\... | 89caa33fb42a74087a5ff9cb3ed56d37bfd63f5a | {
"head_commit": "bd087056c3f43e9ea1af1dfffd913eef91c355dc",
"head_commit_message": "Add changie doc",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20241112-210839.yaml b/.changes/unreleased/Fixes-20241112-210839.yaml\nnew file mode 100644\nindex 00000000000..031e160f092\n--- /dev/null\n+++ b/.chang... | [
{
"diff_hunk": "@@ -1,4 +1,4 @@\n-git+https://github.com/dbt-labs/dbt-adapters.git@main\n+git+https://github.com/dbt-labs/dbt-adapters.git@fix-microbatch-behavior-flag-conditional",
"line": null,
"original_line": 1,
"original_start_line": null,
"path": "dev-requirements.txt",
"start_line": n... | 82a093a2a4cd8d1bed265cf451b08b90a0a7e136 | diff --git a/.changes/unreleased/Fixes-20241112-210839.yaml b/.changes/unreleased/Fixes-20241112-210839.yaml
new file mode 100644
index 00000000000..031e160f092
--- /dev/null
+++ b/.changes/unreleased/Fixes-20241112-210839.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Correct when custom microbatch macro deprecation warning... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} | |
cupy__cupy-3936@493d069 | cupy/cupy | Python | 3,936 | Support cublasXgetrsBatched and add cupy.cublas.batched_gesv | Closes https://github.com/cupy/cupy/issues/3931 | 2020-09-03T13:47:31Z | Performance issue : cupy is 800 times slower than numpy in linalg.solve()
Dear cupy team,
I found that the cupy.linalg.solve routine is much slower than the corresponding numpy routine (about 800 times, which makes is unusable), in a very simple and massively parallel instance. Here I solve 10000 linear systems of s... | It is not surprising to see such slow performance when solving multiple small linear matrix equations, because the current `cupy.linalg.solve` implementation solves the multiple linear matrix equations one by one.
https://github.com/cupy/cupy/blob/e2b5a3c19f8aec1c4acfda239265ba4e54e5bd60/cupy/linalg/solve.py#L65-L68
... | [
{
"body": "Dear cupy team,\r\n\r\nI found that the cupy.linalg.solve routine is much slower than the corresponding numpy routine (about 800 times, which makes is unusable), in a very simple and massively parallel instance. Here I solve 10000 linear systems of size 2x2 in parallel.\r\n\r\n```console\r\nimport nu... | 07fef67fc8a493252f21c393eb007ca0a7d04c10 | {
"head_commit": "493d0698de7d98dff2b93df9e4ec8cc63625636c",
"head_commit_message": "Add error checks",
"patch_to_review": "diff --git a/cupy/cublas.py b/cupy/cublas.py\nnew file mode 100644\nindex 00000000000..04b5cc58ad2\n--- /dev/null\n+++ b/cupy/cublas.py\n@@ -0,0 +1,78 @@\n+import numpy\n+\n+import cupy\n+fr... | [
{
"diff_hunk": "@@ -54,6 +55,9 @@ def solve(a, b):\n if a.ndim == 2:\n return cupy.cusolver.gesv(a, b)\n \n+ if a.shape[-1] <= 256:",
"line": null,
"original_line": 58,
"original_start_line": null,
"path": "cupy/linalg/solve.py",
"start_line": null,
"text": "@user1:\nIs th... | 427a0a7a4901721841e40135068e072cc9b6c760 | diff --git a/cupy/cublas.py b/cupy/cublas.py
new file mode 100644
index 00000000000..63043a82df6
--- /dev/null
+++ b/cupy/cublas.py
@@ -0,0 +1,104 @@
+import numpy
+from numpy import linalg
+
+import warnings
+
+import cupy
+from cupy_backends.cuda.libs import cublas
+from cupy.cuda import device
+from cupy.linalg impo... | {
"difficulty": "high",
"estimated_review_effort": 4,
"problem_domain": "Performance Optimizations"
} |
deepset-ai__haystack-4159@aa5341d | deepset-ai/haystack | Python | 4,159 | feat: add `top_k` to `PromptNode` | ### Related Issues
- fixes https://github.com/deepset-ai/haystack/issues/4158
### Proposed Changes:
- add `top_k` parameter to `PromptNode`
- push down `top_k` to invocation layers and map them to their invocation interface
### How did you test it?
- added tests
### Notes for the reviewer
- I don't know w... | 2023-02-14T17:56:39Z | Add `top_k` to `PromptNode`
**Is your feature request related to a problem? Please describe.**
Setting top_k on `PromptNode` is quite cumbersome. Depending on which invocation context you use, you have to set different params on `PromptModel`:
***For hf models:***
```yaml
....
- name: my_prompt_model
type: ... | [
{
"body": "**Is your feature request related to a problem? Please describe.**\r\nSetting top_k on `PromptNode` is quite cumbersome. Depending on which invocation context you use, you have to set different params on `PromptModel`:\r\n***For hf models:***\r\n```yaml\r\n....\r\n - name: my_prompt_model\r\n typ... | d129598203c551ed705c94307f5d9d4b09d1964f | {
"head_commit": "aa5341d0ad637bd3da242bba70b9000fc7bf3a62",
"head_commit_message": "add top_k to PromptNode",
"patch_to_review": "diff --git a/haystack/nodes/prompt/prompt_node.py b/haystack/nodes/prompt/prompt_node.py\nindex 520c755912..a346e73467 100644\n--- a/haystack/nodes/prompt/prompt_node.py\n+++ b/haysta... | [
{
"diff_hunk": "@@ -459,6 +463,8 @@ def invoke(self, *args, **kwargs):\n # we use keyword stop_words but OpenAI uses stop\n if \"stop_words\" in kwargs:\n kwargs[\"stop\"] = kwargs.pop(\"stop_words\")\n+ if \"top_k\" in kwargs:\n+ kwargs[\"n\"] =... | 79f8f13f29471b69355cd3d4b799876c5013ba7d | diff --git a/haystack/nodes/prompt/prompt_node.py b/haystack/nodes/prompt/prompt_node.py
index 39f94b5d2a..01e2d2d111 100644
--- a/haystack/nodes/prompt/prompt_node.py
+++ b/haystack/nodes/prompt/prompt_node.py
@@ -337,6 +337,7 @@ def invoke(self, *args, **kwargs):
"""
output: List[Dict[str, str]] = [... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} | |
crewAIInc__crewAI-2604@d079e36 | crewAIInc/crewAI | Python | 2,604 | Fix Mem0 OSS | Closes https://github.com/crewAIInc/crewAI/issues/2599 | 2025-04-14T16:48:41Z | [BUG] Mem0 (local config) - Memory.search() got an unexpected keyword argument 'metadata'
### Description
I am currently using local mem0 with the following config
```
local_mem0_config = {
"vector_store": {
"provider": "qdrant",
"config": {
"collection_name": "user_memo... | Hi @Jainish-S,
I think there is one bug associated with the use of local_mem0_config,
This is the issue, #2587. the local config parameter is not being passed currently to the `Mem0` class.
@Vidit-Ostwal Yes I had found it earlier and have fixed it locally.
> [@Vidit-Ostwal](https://github.com/Vidit-Ostwal) Yes I ... | [
{
"body": "### Description\n\nI am currently using local mem0 with the following config\n```\nlocal_mem0_config = {\n \"vector_store\": {\n \"provider\": \"qdrant\",\n \"config\": {\n \"collection_name\": \"user_memory\",\n \"host\": \"192.168.0.222\",\... | 566935fb945477f301ad090cfb00b1e47cbf211e | {
"head_commit": "d079e3652a662b855ae94541345ce60bea22d5ff",
"head_commit_message": "fix lint and tests",
"patch_to_review": "diff --git a/pyproject.toml b/pyproject.toml\nindex d85c43c932..fc393f003c 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -60,7 +60,7 @@ pandas = [\n openpyxl = [\n \"openpyxl>... | [
{
"diff_hunk": "@@ -116,8 +118,10 @@ def search(\n \n # Discard the filters for now since we create the filters\n # automatically when the crew is created.\n+ if hasattr(self, \"llm\"):",
"line": null,
"original_line": 121,
"original_start_line": null,
"path": "src/crewai/... | 69653aaab7c223b4faf0ffbd66182d2edc602a6f | diff --git a/pyproject.toml b/pyproject.toml
index 7f5a5b007f..085a6e2425 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ pandas = [
openpyxl = [
"openpyxl>=3.1.5",
]
-mem0 = ["mem0ai>=0.1.29"]
+mem0 = ["mem0ai>=0.1.94"]
docling = [
"docling>=2.12.0",
]
diff --git a/src/crewai/memory/st... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
dask__dask-7455@e4ec2f2 | dask/dask | Python | 7,455 | Handle Blockwise HLG pack/unpack for concatenate=True | One possible solution to the `Blockwise` serialization challenge discussed in [this comment](https://github.com/dask/dask/issues/7449#issuecomment-805073471). Note that I would certainly prefer a general solution to nested-task serialization.
- [x] Closes #7449
- [x] Tests added / passed
- [x] Passes `black dask`... | 2021-03-23T19:01:45Z | Blockwise with `concatenate=True` broken with LocalCluster + `optimize_graph=False`
**What happened**:
When using a LocalCluster (and probably the distributed scheduler in general), setting `optimize_graph=False` causes strange (and incorrect) behaviour in Blockwise with `concatentate=True`.
**What you expected t... | cc @rjzamora
On Tue, Mar 23, 2021 at 3:29 AM JSKenyon ***@***.***> wrote:
> *What happened*:
> When using a LocalCluster (and probably the distributed scheduler in
> general), setting optimize_graph=False causes strange (and incorrect)
> behaviour in Blockwise with concatentate=True.
>
> *What you expected to happen*... | [
{
"body": "**What happened**:\r\nWhen using a LocalCluster (and probably the distributed scheduler in general), setting `optimize_graph=False` causes strange (and incorrect) behaviour in Blockwise with `concatentate=True`. \r\n\r\n**What you expected to happen**:\r\nBlockwise with `concatenate=True` should func... | 4bc3979333a3f3efff7ef38486107e60df7b5b56 | {
"head_commit": "e4ec2f2be16147c68919287752e1f76bea67b3a2",
"head_commit_message": "use simpler SerializedFunction wrapper",
"patch_to_review": "diff --git a/dask/blockwise.py b/dask/blockwise.py\nindex e116d26c04b..c1bf3588dab 100644\n--- a/dask/blockwise.py\n+++ b/dask/blockwise.py\n@@ -417,6 +417,8 @@ def __d... | [
{
"diff_hunk": "@@ -917,21 +919,12 @@ def make_blockwise_graph(\n if deserializing:\n deps.update(func_future_args)\n args += list(func_future_args)\n- if kwargs:\n- val = {\n- \"function\": dumps_function(apply),\n- ... | dcac77245dee623906abb61e3c315d20b2ccd23f | diff --git a/continuous_integration/environment-mindeps-distributed.yaml b/continuous_integration/environment-mindeps-distributed.yaml
index c41e78995e0..8742c65f649 100644
--- a/continuous_integration/environment-mindeps-distributed.yaml
+++ b/continuous_integration/environment-mindeps-distributed.yaml
@@ -10,7 +10,10... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Bug Fixes"
} |
dask__dask-4525@8f33dcc | dask/dask | Python | 4,525 | Fixed mean() and moment() on sparse arrays | For proper creation of sparse auxiliary arrays, a dispatcher for ones_like has
been added. However, sparse arrays created from ones_like cause sparse
reductions to fail, as it would result in a dense array. To fix that, the arrays
have first to be converted to dense before, which ends up requiring a new
dispatcher ... | 2019-02-25T13:53:40Z | Some functions fail on Dask arrays from sparse
Short sample for reproduction and traceback follow.
```python
import numpy as np
import sparse
import dask.array as da
from numpy.testing import assert_array_equal
x = da.random.random((2, 3, 4), chunks=(1, 2, 2))
x[x < 0.8] = 0
y = x.map_blocks(sparse.COO.fr... | [
{
"body": "Short sample for reproduction and traceback follow.\r\n\r\n```python\r\nimport numpy as np\r\nimport sparse\r\nimport dask.array as da\r\nfrom numpy.testing import assert_array_equal\r\n\r\nx = da.random.random((2, 3, 4), chunks=(1, 2, 2))\r\nx[x < 0.8] = 0\r\n\r\ny = x.map_blocks(sparse.COO.from_num... | 0780ca545a05935f9105bd0fd70dbb04b55986fd | {
"head_commit": "8f33dccd3d95c5e1e7040f174790f0c1eef1262e",
"head_commit_message": "Workaround for mkl.fft failures in test_array_function.py",
"patch_to_review": "diff --git a/.travis.yml b/.travis.yml\nindex 7f864c96f36..893598788e3 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -47,10 +47,12 @@ jobs:\n ... | [
{
"diff_hunk": "@@ -320,7 +320,30 @@ def nanmax(a, axis=None, keepdims=False, split_every=None, out=None):\n \n def numel(x, **kwargs):\n \"\"\" A reduction to count the number of elements \"\"\"\n- return chunk.sum(np.ones_like(x), **kwargs)\n+\n+ if hasattr(x, 'mask'):\n+ return chunk.sum(np.... | b700ddc65ebef6528b45d477e98dda0519656f1b | diff --git a/.travis.yml b/.travis.yml
index 7de0412b195..1dd41c963ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,10 +47,12 @@ jobs:
- PYTHON=3.7
- NUMPY=1.16.2
- PANDAS>=0.24.1
+ - UPSTREAM_SPARSE=1
- *test_and_lint
- *no_coverage
- *no_optimize
- *imports
+ ... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "Bug Fixes"
} | |
dask__dask-7413@ec7bddd | dask/dask | Python | 7,413 | Add config for handling obj normalization with missing __dask_tokenize__ | - [x] Closes #6555
- [x] Added `tokenize.allow-random` config, accepting `True` or `False`.
- [x] Tests added / passed
- [x] Added `test_normalize_object` to `dask/tests/test_base.py`.
- [x] Passes `black dask` / `flake8 dask` | 2021-03-17T14:05:12Z | Flag for raising an error when `normalize_object` doesn't find `__dask_tokenize__`
I ran into a bit of a nasty surprised when I realized some of my Delayed objects resulted in a different token when I called `tokenize()`. This is because in my data I had some objects which didn't have `__dask_tokenize__`. I fixed those... | Thanks for raising an issue @STOpandthink! I can imagine this was tedious to track down. Adding a config option to raise an error or warn when falling back to a random token (which is `False` by default) seems like a nice addition for certain use cases. Is this something you're interested in working on? (no obligation ... | [
{
"body": "I ran into a bit of a nasty surprised when I realized some of my Delayed objects resulted in a different token when I called `tokenize()`. This is because in my data I had some objects which didn't have `__dask_tokenize__`. I fixed those errors, but I'm afraid they might come up again silently. It wo... | b888af46dd340f7573faef1dd9c2c8905820405d | {
"head_commit": "ec7bddd3be307364d5771c36768f5bd54eb81461",
"head_commit_message": "Add config for handling obj normalization with missing __dask_tokenize__ (#6555)",
"patch_to_review": "diff --git a/dask/base.py b/dask/base.py\nindex 1d5ad89b8bd..4ea837f451d 100644\n--- a/dask/base.py\n+++ b/dask/base.py\n@@ -8... | [
{
"diff_hunk": "@@ -839,7 +839,42 @@ def normalize_object(o):\n method = getattr(o, \"__dask_tokenize__\", None)\n if method is not None:\n return method()\n- return normalize_function(o) if callable(o) else uuid.uuid4().hex\n+\n+ if callable(o):\n+ return normalize_function(o)\n+\n... | cb9d9d1b46414668792ec27e9ca46735214d5ee1 | diff --git a/dask/base.py b/dask/base.py
index a9368bfe8ea..8a9c100552a 100644
--- a/dask/base.py
+++ b/dask/base.py
@@ -839,7 +839,14 @@ def func(seq):
try:
return list(map(normalize_token, seq))
except RecursionError:
- return str(uuid.uuid4())
+ if not config.get(... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
encode__httpx-351@8ae0126 | encode/httpx | Python | 351 | Add `.elapsed` onto Response objects tracking how long a request took. | This should fix https://github.com/encode/httpx/issues/338
Example:
```python
import asyncio
import httpx
async def await_url(c):
r = await c.get('http://httpbin.org/get')
await r.read()
print(r.elapsed)
async def httpx_test():
client = httpx.AsyncClient()
await asyncio.gather(*... | 2019-09-17T00:49:06Z | Missing requests' elapsed property on Response object.
The requests Response object has an elapsed property which returns a datetime.timedelta instance. This appears to be missing from the httpx Response.
A nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspec... | Yup, I remember I had identified this discrepency in https://github.com/encode/httpx/pull/298 already. I think it's a nice thing to have & one step further towards Requests compatibility. :)
> A nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspector
It's a... | [
{
"body": "The requests Response object has an elapsed property which returns a datetime.timedelta instance. This appears to be missing from the httpx Response.\r\n\r\nA nice to have feature would be to break elapsed into more fine-grained timings similar to Firefox's web inspector (Blocked, DNS resolution, Con... | 8155352d2028b7f74ccd53acdf5a8d74b84e6d15 | {
"head_commit": "8ae01264892a3413c32d7321095a8d15d03c1349",
"head_commit_message": "Address feedback",
"patch_to_review": "diff --git a/docs/api.md b/docs/api.md\nindex 14cc4be9b5..83fe1e81cb 100644\n--- a/docs/api.md\n+++ b/docs/api.md\n@@ -59,6 +59,11 @@\n * `.request` - **Request**\n * `.cookies` - **Cookies*... | [
{
"diff_hunk": "@@ -12,7 +12,7 @@ def test_get(server):\n \n \n def test_post(server):\n- response = httpx.post(server.url, data=b\"Hello, world!\")\n+ response = httpx.post(server.url, data=b\" Hello, world!\")",
"line": null,
"original_line": 15,
"original_start_line": null,
"path": "t... | 50177eae6c67acd50455659b486e58c919c03b54 | diff --git a/docs/api.md b/docs/api.md
index 14cc4be9b5..83fe1e81cb 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -59,6 +59,11 @@
* `.request` - **Request**
* `.cookies` - **Cookies**
* `.history` - **List[Response]**
+* `.elapsed` - **[timedelta](https://docs.python.org/3/library/datetime.html)**
+ * The amount of... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
certbot__certbot-7837@2b55229 | certbot/certbot | Python | 7,837 | Exposes environment variable to let hooks scripts know when the last challenge is handled | Fixes #5484
This PRs makes Certbot expose two new environment variables in the auth and cleanup hooks of the `manual` plugin:
* `CERTBOT_REMAINING_CHALLENGES` contains the number of challenges that remain after the current one (so it equals to 0 when the script is called for the last challenge)
* `CERTBOT_ALL_DOM... | 2020-03-04T23:52:44Z | Feature request: Add option to know what is the last domain passed to dns hook script
Hi,
certbot doesn't provide an official hook to work with the API of my DNS provider so I'm using my own script. Well, we know every time we create/modify a record on our DNS provider it needs to propagate to all the authoritative ... | Sounds like a question for @bmw
We're currently rethinking a bit about how our plugins work, but if we don't end up making major changes there, I think can and should do something like this.
That sounds good, we'll appreciate it.
Thank you very much.
-----Original Message-----
From: Brad Warren <notifications@github... | [
{
"body": "Hi,\r\n\r\ncertbot doesn't provide an official hook to work with the API of my DNS provider so I'm using my own script. Well, we know every time we create/modify a record on our DNS provider it needs to propagate to all the authoritative DNS servers, in my case it takes 1 minute and 30 seconds approx... | 7f63141e410ae7ce200c7c7408d05c87eae0c5f5 | {
"head_commit": "2b5522978597776e3970f367c1a0eaa0b13e1c94",
"head_commit_message": "Less variables and less lines",
"patch_to_review": "diff --git a/certbot/certbot/_internal/plugins/manual.py b/certbot/certbot/_internal/plugins/manual.py\nindex 3204fe1dab2..1804e7d7e49 100644\n--- a/certbot/certbot/_internal/pl... | [
{
"diff_hunk": "@@ -134,9 +133,11 @@ def _verify_ip_logging_ok(self):\n else:\n raise errors.PluginError('Must agree to IP logging to proceed')\n \n- def _perform_achall_with_script(self, achall):\n+ def _perform_achall_with_script(self, achall, achalls):\n env = dict(C... | 5fee153f755ca2f968cbf5572ddf7a597b000332 | diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md
index 868f3c8be78..903af0610ba 100644
--- a/certbot/CHANGELOG.md
+++ b/certbot/CHANGELOG.md
@@ -6,7 +6,10 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
### Added
-*
+* Expose two new environment variables in the authenticator and cleanup ... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "New Feature Additions"
} |
dbt-labs__dbt-core-7577@86d6d98 | dbt-labs/dbt-core | Python | 7,577 | CT 2510 Throw error for duplicate versioned and non versioned model names | resolves #7487
### Description
The _check_resource_uniqueness method in core/dbt/parser/manifest.py has been modified to check for non-versioned models with the same "name" as versioned models.
### Checklist
- [x] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTI... | 2023-05-09T21:09:58Z | [CT-2510] [Bug] Raise an error if non-versioned model is defined with same name as existing versioned model
Set up:
```sql
-- models/my_model_v1.sql
select 1 as id
```
```yml
# models/whatever.yml
models:
- name: my_model
versions:
- v: 1
```
```
$ dbt parse
12:48:12 Running with dbt=1.5.0
... | This is not a partial parsing bug per se. I've created a test case which does not fail appropriately even with full parsing.
I haven't been able to recreate the compilation error. Whether I create the non-versioned model first or second, it never complains.
I tried the same set of steps as outlined and was **not** able... | [
{
"body": "Set up:\r\n```sql\r\n-- models/my_model_v1.sql\r\nselect 1 as id\r\n```\r\n```yml\r\n# models/whatever.yml\r\nmodels:\r\n - name: my_model\r\n versions:\r\n - v: 1\r\n```\r\n\r\n```\r\n$ dbt parse\r\n12:48:12 Running with dbt=1.5.0\r\n12:48:14 Performance info: target/perf_info.json\r\n```... | 43d949c5cc46da2e7c893f51fe4a35dc1486e3ac | {
"head_commit": "86d6d98c590041084527aab6243207b48020eb9f",
"head_commit_message": "Changie",
"patch_to_review": "diff --git a/.changes/unreleased/Fixes-20230509-165007.yaml b/.changes/unreleased/Fixes-20230509-165007.yaml\nnew file mode 100644\nindex 00000000000..0c0f06b0525\n--- /dev/null\n+++ b/.changes/unrel... | [
{
"diff_hunk": "@@ -1280,6 +1287,17 @@ def _check_resource_uniqueness(\n \n alias_resources[full_node_name] = node\n \n+ intersection_versioned = set(versioned_resources.keys()).intersection(\n+ set(unversioned_resources.keys())\n+ )\n+ if intersection_versioned:",
"line": null,
... | 4377af79d34b3272136477ef02dc18b3e37a00e0 | diff --git a/.changes/unreleased/Fixes-20230509-165007.yaml b/.changes/unreleased/Fixes-20230509-165007.yaml
new file mode 100644
index 00000000000..0c0f06b0525
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230509-165007.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Throw error for duplicated versioned and unversioned mod... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
getredash__redash-5088@311ec78 | getredash/redash | Python | 5,088 | Add default limit (1000) to SQL queries | ## What type of PR is this? (check all applicable)
- [x] Feature
## Description
Add a default limit 1000 for query execution, now it contains both the frontend changes(add a checkbox) and backend changes.
## Related Tickets & Documents
REDASH-112, Closes #976.
## Mobile & Desktop Screenshots/Recordings ... | 2020-08-04T16:24:44Z | Limit number of records returned by a query
I typically run `SELECT * FROM ...` just to get a peak on the data and in many cases forget to add limit (yeah I know I know....) .
It would be nice if REDASH would have tunable default limit e.g. 10,000 rows (same way most of the desktop tools like TOAD or Navicat have). No... | Sounds like a good feature, but need some research on how it will work with the different data source types. Also need to make sure not to apply it to non SELECT queries.
Please find below an example:
`SELECT * FROM table LIMIT 5;`
any development yet for this feature ?
We get very high celery CPU load occasionally,... | [
{
"body": "I typically run `SELECT * FROM ...` just to get a peak on the data and in many cases forget to add limit (yeah I know I know....) .\n\nIt would be nice if REDASH would have tunable default limit e.g. 10,000 rows (same way most of the desktop tools like TOAD or Navicat have). Not sure if this is easy ... | 31ddd0fb7999d427bcc8707e016038b90b63e032 | {
"head_commit": "311ec780902dcc018f692ea4170557d9ea406b98",
"head_commit_message": "Add frontend changes and connect to backend",
"patch_to_review": "diff --git a/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx\nnew file mode 10064... | [
{
"diff_hunk": "@@ -865,10 +867,14 @@ def dashboard_api_keys(self):\n return [api_key[0] for api_key in api_keys]\n \n \n-@listens_for(Query.query_text, \"set\")\n-def gen_query_hash(target, val, oldval, initiator):\n- target.query_hash = utils.gen_query_hash(val)\n- target.schedule_failures = 0\n... | 361308cb10d33d45f11e02925643f84247c896dc | diff --git a/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx
new file mode 100644
index 0000000000..4ac0330299
--- /dev/null
+++ b/client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx
@@ -0,0 +1,37 @@
+import React, { useCallba... | {
"difficulty": "medium",
"estimated_review_effort": 4,
"problem_domain": "New Feature Additions"
} |
getredash__redash-4638@333ee8e | getredash/redash | Python | 4,638 | Fix comparison error when scale is None | ## What type of PR is this? (check all applicable)
- [x] Bug Fix
## Description
Prevents `'>' not supported between instances of 'NoneType' and 'int'` error when scale is `None`
## Related Tickets & Documents
Closes #4786.
| 2020-02-11T21:51:40Z | error running query : ** '>' is not supported between instance of NoneType and 'int'
Issue Summary:
Database = Oracle 12c
`select count(*) from table `
throwing the following error
`error running query : ** '>' is not supported between instance of NoneType and 'int'`
Redash v9.0.0-alpha(dev) | [
{
"body": "Issue Summary:\r\nDatabase = Oracle 12c\r\n\r\n`select count(*) from table `\r\n\r\nthrowing the following error\r\n\r\n`error running query : ** '>' is not supported between instance of NoneType and 'int'`\r\n\r\nRedash v9.0.0-alpha(dev)\r\n\r\n\r\n",
"number": 4786,
"title": "error running ... | ddb0ef15c1340e7de627e928f80486dfd3d6e1d5 | {
"head_commit": "333ee8ed2b9d0f4039f7ddfd7e0bac4ad7010b6d",
"head_commit_message": "Update oracle.py",
"patch_to_review": "diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py\nindex 4a675836e4..9aaf3d488b 100644\n--- a/redash/query_runner/oracle.py\n+++ b/redash/query_runner/oracle.py\n@@ ... | [
{
"diff_hunk": "@@ -35,7 +35,7 @@ class Oracle(BaseSQLQueryRunner):\n @classmethod\n def get_col_type(cls, col_type, scale):\n if col_type == cx_Oracle.NUMBER:\n- return TYPE_FLOAT if scale > 0 else TYPE_INTEGER\n+ return TYPE_INTEGER if scale is False else TYPE_FLOAT",
... | e6550c236ca85ad004e1860766223ce9a9c6cf6f | diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py
index 4a675836e4..e079c297a7 100644
--- a/redash/query_runner/oracle.py
+++ b/redash/query_runner/oracle.py
@@ -35,7 +35,11 @@ class Oracle(BaseSQLQueryRunner):
@classmethod
def get_col_type(cls, col_type, scale):
if col_type ... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} | |
getredash__redash-4186@ac02337 | getredash/redash | Python | 4,186 | Fix query based dropdown not adding quote marks correctly | ## What type of PR is this? (check all applicable)
<!-- Please leave only what's applicable -->
- [x] Bug Fix
## Description
This is not perfect yet, I still wanna explore a few more options without having the Dropdown Options in the Parameter structure context (that's the only difference from the regular Dropd... | 2019-09-25T23:06:40Z | Query with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly
### Issue Summary
Query with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly.
### Steps to Reproduce
1. Create a query with ... | @gabrieldutra is this expected or a bug?
@ranbena it should have the quote mark in any case when you set them.
@myonlylonely I tried it in our [netlify preview](https://redash-preview.netlify.com/queries/123/source?p_test=%5B%22MrCirca%22%5D#219) and it seems to be adding the quotes as expected:
<img src="https:/... | [
{
"body": "### Issue Summary\r\n\r\nQuery with a drop down list based on query (Allow multiple values with quotation mark) not adding quotation mark correctly.\r\n\r\n### Steps to Reproduce\r\n\r\n1. Create a query with a parameter with query based dropdown list.\r\n2. Select allow multiple values, double quota... | cb144598816e40ddb133e046772da01ce53a41e8 | {
"head_commit": "ac023371080942cd27d800842463f0e31b68f9f2",
"head_commit_message": "Normalize array in parameter structure",
"patch_to_review": "diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx\nindex d55f5aa2b6..6b69559c31 100644\n--- a/client/... | [
{
"diff_hunk": "@@ -253,6 +253,12 @@ export class Parameter {\n }\n }\n \n+ if (this.type === 'query' && !isEmptyValue(value)) {\n+ if (this.multiValuesOptions && !isArray(value) && value !== null) {",
"line": null,
"original_line": 257,
"original_start_line": null,
"path": "cl... | 18e2ed87557b5453b743be06541426e3ef9a107a | diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx
index d55f5aa2b6..6b69559c31 100644
--- a/client/app/components/QueryBasedParameterInput.jsx
+++ b/client/app/components/QueryBasedParameterInput.jsx
@@ -1,4 +1,4 @@
-import { find, isFunction, isArray, ... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
home-assistant__core-147576@37735ee | home-assistant/core | Python | 147,576 | Do not factory reset old Z-Wave controller during migration | ## Proposed change
<!--
Describe the big picture of your changes here to communicate to the
maintainers why we should accept this pull request. If it fixes a bug
or resolves a feature request, be sure to link to that issue in the
additional information section.
-->
Also removed the confirmation before th... | 2025-06-26T09:04:36Z | Do not factory reset old controller during NVM migration
We decided that the risk of resetting a working controller before the replacement is up and running is more relevant than the potential issue of a user leaving the old controller plugged in and messing with communication. | [
{
"body": "We decided that the risk of resetting a working controller before the replacement is up and running is more relevant than the potential issue of a user leaving the old controller plugged in and messing with communication.",
"number": 102,
"title": "Do not factory reset old controller during N... | 6f4615f012c3339542a9cc1e4dc24b4a0a99a744 | {
"head_commit": "37735eefed03971f1713bf4276388ddbb437e0de",
"head_commit_message": "Do not factory reset old Z-Wave controller during migration",
"patch_to_review": "diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py\nindex 5e8e702283976f..8fe05f91f01... | [
{
"diff_hunk": "@@ -3399,25 +3370,6 @@ async def test_reconfigure_migrate_low_sdk_version(\n \n \n @pytest.mark.usefixtures(\"supervisor\", \"addon_running\")\n-@pytest.mark.parametrize(",
"line": 3402,
"original_line": 3402,
"original_start_line": null,
"path": "tests/components/zwave_js/test_c... | ec4cc9885faba1d972aadb6947a7a7baaaab554c | diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py
index 2c37ee4b554301..a109719965cbf1 100644
--- a/homeassistant/components/zwave_js/config_flow.py
+++ b/homeassistant/components/zwave_js/config_flow.py
@@ -845,11 +845,8 @@ async def async_step_intent_migr... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} | |
home-assistant__core-146453@71eab0c | home-assistant/core | Python | 146,453 | Split deprecated system issue in 2 places | <!--
You are amazing! Thanks for contributing to our project!
Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
-->
## Proposed change
<!--
Describe the big picture of your changes here to communicate to the
maintainers why we should accept this pull request. If it fixes a bug
or... | 2025-06-10T13:01:25Z | No repair for supervisor deprecation
### The problem
A repair is not generated for a supervised system.
## System Information
version | core-2025.6.0b0
-- | --
installation_type | Home Assistant Supervised
dev | false
hassio | true
docker | true
user | root
virtualenv | false
python_version | 3.13.3
os_name | Linux
... | supervisor logs
```
[32m2025-05-27 07:09:51.284 INFO (MainThread) [supervisor.homeassistant.api] Updated Home Assistant API token[0m
[32m2025-05-27 07:09:51.302 INFO (MainThread) [supervisor.homeassistant.core] Updating Home Assistant to version 2025.6.0b0[0m
[32m2025-05-27 07:09:51.302 INFO (MainThread) [supervi... | [
{
"body": "### The problem\n\nA repair is not generated for a supervised system.\n\n## System Information\n\nversion | core-2025.6.0b0\n-- | --\ninstallation_type | Home Assistant Supervised\ndev | false\nhassio | true\ndocker | true\nuser | root\nvirtualenv | false\npython_version | 3.13.3\nos_name | Linux\nos... | d015dff855995760a2695584bac6637dab17b410 | {
"head_commit": "71eab0c5901862f659ae3f92be43b6458fec6500",
"head_commit_message": "Split deprecated system issue in 2 places",
"patch_to_review": "diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py\nindex eeeedff00bbd29..ae07aa48a52e3b 100644\n--- a/homeassist... | [
{
"diff_hunk": "@@ -546,6 +554,63 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:\n await coordinator.async_config_entry_first_refresh()\n hass.data[ADDONS_COORDINATOR] = coordinator\n \n+ system_info = await async_get_system_info(hass)\n+\n+ def deprecated_setup_i... | ca08d75cec1a09f0c640e6f2f2802f3f7722e75e | diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py
index eeeedff00bbd2..041877e394423 100644
--- a/homeassistant/components/hassio/__init__.py
+++ b/homeassistant/components/hassio/__init__.py
@@ -37,6 +37,7 @@
config_validation as cv,
device_registry as dr,... | {
"difficulty": "medium",
"estimated_review_effort": 3,
"problem_domain": "Bug Fixes"
} |
getredash__redash-3008@b887f50 | getredash/redash | Python | 3,008 | Google analytics fix fixes #2965 | resolves #2965 | 2018-10-27T22:43:06Z | GA Data Source throws an error when no rows returned
### Issue Summary
Google Analytics Data Source throws `Error running query: 'rows'` when the query result is empty.
I have a pretty simple query with dimensions and filters, like:
```json
{
"ids": "ga:177xxxxxx",
"start_date": "2018-10-08",
"end_date... | [
{
"body": "### Issue Summary\r\n\r\nGoogle Analytics Data Source throws `Error running query: 'rows'` when the query result is empty.\r\nI have a pretty simple query with dimensions and filters, like:\r\n\r\n```json\r\n{\r\n \"ids\": \"ga:177xxxxxx\",\r\n \"start_date\": \"2018-10-08\",\r\n \"end_date\": \"2... | ab6ed7da34dd2797914382c435981450b7bf9d7a | {
"head_commit": "b887f502c56ed83c3c8ff68bc9d65311be3c00f8",
"head_commit_message": "resolves #2965",
"patch_to_review": "diff --git a/redash/query_runner/google_analytics.py b/redash/query_runner/google_analytics.py\nindex e8b70eb01f..19def81243 100644\n--- a/redash/query_runner/google_analytics.py\n+++ b/redash... | [
{
"diff_hunk": "@@ -43,36 +43,37 @@ def parse_ga_response(response):\n })\n \n rows = []\n- for r in response['rows']:\n- d = {}\n- for c, value in enumerate(r):\n- column_name = response['columnHeaders'][c]['name']\n- column_type = filter(lambda col: col['name... | e153823e9bb6371221704fd7fe9e98180b317822 | diff --git a/redash/query_runner/google_analytics.py b/redash/query_runner/google_analytics.py
index e8b70eb01f..71be522015 100644
--- a/redash/query_runner/google_analytics.py
+++ b/redash/query_runner/google_analytics.py
@@ -43,7 +43,7 @@ def parse_ga_response(response):
})
rows = []
- for r in res... | {
"difficulty": "low",
"estimated_review_effort": 2,
"problem_domain": "Bug Fixes"
} |
Subsets and Splits
Review Test Instances
Retrieves basic metadata about code review instances but doesn't provide any analytical insights or patterns beyond raw data access.