Merge pull request #306 from koxudaxi/fix_wrong_call_parameter_with_k…

…wargs

Fix wrong call parameter with **kwargs

resources/META-INF/plugin.xml

@@ -1,9 +1,14 @@
 <idea-plugin url="https://github.com/koxudaxi/pydantic-pycharm-plugin" require-restart="true">
     <id>com.koxudaxi.pydantic</id>
     <name>Pydantic</name>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
     <vendor email="koaxudai@gmail.com">Koudai Aono @koxudaxi</vendor>
     <change-notes><![CDATA[
+    <h2>version 0.3.3</h2>
+    <p>BugFixes</p>
+    <ul>
+        <li>Fix wrong call parameter with **kwargs [#306]</li>
+    </ul>
     <h2>version 0.3.2</h2>
     <p>BugFixes</p>
     <ul>

src/com/koxudaxi/pydantic/PydanticAnnotator.kt

@@ -20,6 +20,7 @@ class PydanticAnnotator : PyAnnotator() {
     private fun annotatePydanticModelCallableExpression(pyCallExpression: PyCallExpression) {
         val context = TypeEvalContext.userInitiated(pyCallExpression.project, pyCallExpression.containingFile)
         val pyClass = getPydanticPyClass(pyCallExpression, context) ?: return
+        if (getPydanticModelInit(pyClass, context) != null) return
         val unFilledArguments =
             getPydanticUnFilledArguments(pyClass, pyCallExpression, pydanticTypeProvider, context).nullize()
                 ?: return

src/com/koxudaxi/pydantic/PydanticInspection.kt

@@ -81,6 +81,7 @@ class PydanticInspection : PyInspection() {
 
         private fun inspectPydanticModelCallableExpression(pyCallExpression: PyCallExpression) {
             val pyClass = getPydanticPyClass(pyCallExpression, myTypeEvalContext) ?: return
+            if (getPydanticModelInit(pyClass, myTypeEvalContext) != null) return
             pyCallExpression.arguments
                 .filterNot { it is PyKeywordArgument || (it as? PyStarArgument)?.isKeyword == true }
                 .forEach {

src/com/koxudaxi/pydantic/PydanticTypeProvider.kt

@@ -466,9 +466,8 @@ class PydanticTypeProvider : PyTypeProviderBase() {
         val clsType = (context.getType(pyClass) as? PyClassLikeType) ?: return null
 
         getPydanticModelInit(pyClass, context)?.let {
-            val callParameters = it.parameterList.parameters
+            val callParameters = it.getParameters(context)
                 .filterNot { parameter -> parameter.isSelf }
-                .map { parameter -> PyCallableParameterImpl.psi(parameter) }
             return PyCallableTypeImpl(callParameters, clsType.toInstance())
         }
 

testData/inspection/acceptsOnlyKeywordArgumentsInit.py

@@ -0,0 +1,17 @@
+from pydantic import BaseModel
+from pydantic.dataclasses import dataclass
+
+class A(BaseModel):
+    a: str
+
+    def __init__(self, a = '123') -> None:
+        super(A, self).__init__(a=a)
+
+A('a')
+
+@dataclass
+class B():
+    a: str
+
+
+B('a')

testSrc/com/koxudaxi/pydantic/PydanticInspectionTest.kt

@@ -17,6 +17,10 @@ open class PydanticInspectionTest : PydanticInspectionBase() {
         doTest()
     }
 
+    fun testAcceptsOnlyKeywordArgumentsInit() {
+        doTest()
+    }
+
     fun testAcceptsOnlyKeywordArgumentsSingleStarArgument() {
         doTest()
     }

testSrc/com/koxudaxi/pydantic/PydanticTypeInspectionV18Test.kt

@@ -24,8 +24,4 @@ open class PydanticTypeInspectionV18Test : PydanticInspectionBase("v18") {
     fun testGenericModel() {
         doTest()
     }
-
-    fun testOverrideInit() {
-        doTest()
-    }
 }