feenkcom PythonBridge extensions

python_bridge.py → PythonBridgeRuntime/PythonBridge/python_bridge.py

@@ -5,6 +5,12 @@
 from PythonBridge.bridge_hooks import *
 from PythonBridge.object_registry import registry
 
+def pbbreak():
+        print("Breaking now")
+        breakpoint()
+        print("Continuing")
+
+
 class EvalCommand:
 	statements = ""
 	binding = {}
@@ -158,4 +164,4 @@ def run_bridge():
 		bridge_globals.logger.log("PYTHON: Finished command execution")
 
 if __name__ == "__main__":
-	run_bridge()
+	run_bridge()

PythonBridgeRuntime/PythonBridge/tfactorial.py

@@ -0,0 +1,36 @@
+import argparse
+import threading
+import time
+
+
+# Calculate the factorial
+def factorial(n, t):
+    time.sleep(n*t/4)
+    print("Start: " + str(t) + ": " + str(n))
+    if n == 1:
+        res = 1
+        if t == 1:
+            print("Feel free to break here")
+    else:
+        res = n * factorial(n-1, t)
+    return res
+
+
+# Calculate the factorial and print the result
+def factorial_thread(n, t):
+    time.sleep(2)
+    result = factorial(n, t)
+    print("Thread " + str(t) + " = "+str(result))
+
+
+def launch_factorials(n):
+    threads = []
+    print("Calculate: "+str(n))
+    breakpoint()
+    for i in range(n):
+        threads.append(threading.Thread(target=factorial_thread, args=(n+i, i+1)))
+        threads[-1].start()
+    print("Wait for the results")
+    for thread in threads:
+        thread.join()
+    print("Done")

install_env.sh → PythonBridgeRuntime/install_env.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 export PIPENV_VENV_IN_PROJECT=1
-pipenv install
+pipenv install
+pipenv run pip install debugpy

PythonBridgeRuntime/killpbservers.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Kill all the PythonBridge servers running on localhost.
+# This assumes they are being run as the current user.
+# Any associated debug server processes will automatically exit.
+
+# List the processes.
+# If none are found, exit successfully
+ps aux | grep -E 'PythonBridgeRuntime/start_bridge\.py.*msgpack'
+status=$?
+if [ $status -eq 1 ]
+then
+	exit 0
+fi
+
+# Kill them
+ps aux | grep -E 'PythonBridgeRuntime/start_bridge\.py.*msgpack' | awk '{print $2}' | xargs kill
+exit $?

src/BaselineOfPythonBridge/BaselineOfPythonBridge.class.st

@@ -12,13 +12,13 @@ BaselineOfPythonBridge >> baseline: spec [
 		do: [			
 			spec
 				baseline: 'OSSubprocess' 
-				with: [ spec repository: 'github://pharo-contributions/OSSubprocess:v1.0.0/repository' ].
+				with: [ spec repository: 'github://feenkcom/OSSubprocess:main/repository' ].
 			spec
 				baseline: 'Python3Generator' 
 				with: [ spec repository: 'github://juliendelplanque/Python3Generator:v2.0.0/repository' ].
 			spec baseline: 'NeoJSON' with: [
                 spec
-                    repository: 'github://svenvc/NeoJSON/repository' ].
+                    repository: 'github://svenvc/NeoJSON:v17/repository' ].
 			spec baseline: 'MessagePack' with: [
                 spec
                     repository: 'github://msgpack/msgpack-smalltalk:v1.3.1/repository' ].

src/PythonBridge-Pharo/PBMsgPackPharoBrokerTest.class.st

@@ -60,6 +60,17 @@ PBMsgPackPharoBrokerTest >> sendMessageToBroker: dict answerBlock: aBlock [
 	self sleepAWhile.
 ]
 
+{ #category : #utils }
+PBMsgPackPharoBrokerTest >> sendMessageToBroker: dict answerEquals: ansDict [
+	| flag |
+	flag := false.
+	self sendMessageToBroker: dict answerBlock: [ :anAssoc |
+		flag := true.
+		self assert: anAssoc value equals: ansDict ].
+	self sleepAWhile.
+	self assert: flag
+]
+
 { #category : #utils }
 PBMsgPackPharoBrokerTest >> sleepAWhile [
 	(Delay forMilliseconds: 50) wait

src/PythonBridge-Pharo/PBPharoPipenvProcess.class.st

@@ -3,41 +3,58 @@ Class {
 	#superclass : #PBAbstractProcess,
 	#instVars : [
 		'process',
-		'environmentVariables'
+		'environmentVariables',
+		'serverDebugger'
 	],
 	#classVars : [
 		'PipenvPath'
 	],
 	#category : #'PythonBridge-Pharo-Processes'
 }
 
+{ #category : #'class initialization' }
+PBPharoPipenvProcess class >> initialize [ 
+
+	SessionManager default registerUserClassNamed: self name.
+]
+
 { #category : #initialization }
 PBPharoPipenvProcess class >> pipenvPath [
-	^ PipenvPath isEmptyOrNil 
-			ifTrue: [ PipenvPath := self resolvePipenvPath ]
-			ifFalse: [ PipenvPath ]
+	^ PipenvPath 
+			ifNil: [ PipenvPath := self resolvePipenvPath ]
+			ifNotNil: [ PipenvPath ]
 ]
 
 { #category : #initialization }
-PBPharoPipenvProcess class >> pipenvPath: aString [
-	PipenvPath := aString
+PBPharoPipenvProcess class >> pipenvPath: aFileReference [
+	PipenvPath := aFileReference
 ]
 
 { #category : #accessing }
 PBPharoPipenvProcess class >> platform [
 	^ PBPharoPlatform current
 ]
 
+{ #category : #initialization }
+PBPharoPipenvProcess class >> reset [ 
+	<script>
+
+	PipenvPath := nil.
+]
+
 { #category : #initialization }
 PBPharoPipenvProcess class >> resolvePipenvPath [
-	^ (OSSUnixSubprocess new
+	| path |
+
+	(OSSUnixSubprocess new
 				command: '/usr/bin/which';
 				arguments: (Array with: 'pipenv');
 				addAllEnvVariablesFromParentWithoutOverride;
 				redirectStdout;
 				terminateOnShutdown;
-				runAndWaitOnExitDo: [ :command :outString | ^ outString trim ]) 
-					ifEmpty: [ self signalPipenvNotFound ]
+				runAndWaitOnExitDo: [ :command :outString | path := outString trim ]).
+	path ifEmpty: [ self signalPipenvNotFound ].
+	^ path asFileReference
 ]
 
 { #category : #initialization }
@@ -55,14 +72,38 @@ PBPharoPipenvProcess class >> signalPipenvNotFound [
 	Error signal: 'Error: Pipenv command could not be found.'
 ]
 
+{ #category : #'system startup' }
+PBPharoPipenvProcess class >> startUp: resuming [
+	"On startup any instances saved during the last session will be invalid (since the processes are terminated on shutdown).  Mark them as stopped."
+
+	resuming ifTrue: 
+		[ self allInstancesDo: [ :each | each stop ] ]
+]
+
+{ #category : #'start-stop' }
+PBPharoPipenvProcess >> debuggerStateChangedAction: aDAPThreadStateChanged [
+	"Respond to the debugger state changed notification.
+	Signal all promises that the debugger has been paused."
+
+	aDAPThreadStateChanged isStopped ifTrue:
+		[ self application notifyDebuggerPaused: serverDebugger ]
+]
+
 { #category : #accessing }
 PBPharoPipenvProcess >> environmentVariables [
 	^ environmentVariables
 ]
 
 { #category : #accessing }
 PBPharoPipenvProcess >> errorMessage [
-	^ process stderrStream contents
+	^ self stderr
+]
+
+{ #category : #testing }
+PBPharoPipenvProcess >> hasProcess [
+	"Answer a boolean indicating whether the receiver has a process object"
+
+	^ process isNotNil
 ]
 
 { #category : #initialization }
@@ -72,6 +113,36 @@ PBPharoPipenvProcess >> initialize [
 	self setDefaultEnvironmentVariables
 ]
 
+{ #category : #utils }
+PBPharoPipenvProcess >> installModule: aString in: aPBApplication [
+	"Install the supplied module using `pipenv run pip install aString`"
+	| pipenvPath proc arguments stdoutStream stderrStream |
+
+	pipenvPath := aPBApplication settings pipenvPath ifNil: [ self class pipenvPath ].
+	arguments := { 'run'. 'pip'. 'install'. aString. }.
+	stdoutStream := String new writeStream.
+	stderrStream := String new writeStream.
+	proc := OSSUnixSubprocess new
+		command: pipenvPath fullName;
+		arguments: arguments;
+		workingDirectory: aPBApplication workingDirectory fullName;
+		addAllEnvVariablesFromParentWithoutOverride;
+		terminateOnShutdown;
+		redirectStdout;
+		redirectStderr;
+		yourself.
+	environmentVariables associationsDo: [ :assoc |
+		proc environmentAt: assoc key put: assoc value ].
+	proc run.
+	proc
+		waitForExitPollingEvery: (Delay forMilliseconds: 500)
+		doing: [ :aProcess :outStream :errStream | 
+			stdoutStream nextPutAll: outStream upToEnd.
+			stderrStream nextPutAll: errStream upToEnd ].
+	proc isSuccess ifFalse:
+		[ self error: 'Unable to install module: ', aString asString ].
+]
+
 { #category : #testing }
 PBPharoPipenvProcess >> isRunning [
 	^ process
@@ -82,20 +153,28 @@ PBPharoPipenvProcess >> isRunning [
 { #category : #private }
 PBPharoPipenvProcess >> newProcess [
 	| newProcess |
-	newProcess := OSSUnixSubprocess new
-				command: self class pipenvPath;
+
+	newProcess := PBUnixSubprocess new
+				command: (self settings pipenvPath ifNil:
+					[ self class pipenvPath ]) fullName;
 				arguments: self processArguments;
 				workingDirectory: self workingDirectory fullName;
 				addAllEnvVariablesFromParentWithoutOverride;
-				redirectStdout;
-				redirectStderr;
 				terminateOnShutdown;
 				yourself.
 	environmentVariables associationsDo: [ :assoc |
 		newProcess environmentAt: assoc key put: assoc value ].
 	^ newProcess
 ]
 
+{ #category : #accessing }
+PBPharoPipenvProcess >> pipenvPath [ 
+	"Answer the default pipenvPath.
+	This may be overridden by the application settings."
+
+	^ self class pipenvPath
+]
+
 { #category : #accessing }
 PBPharoPipenvProcess >> process [
 	^ process
@@ -104,10 +183,19 @@ PBPharoPipenvProcess >> process [
 { #category : #private }
 PBPharoPipenvProcess >> processArguments [
 	| args |
+
 	args := OrderedCollection new.
 	args
 		add: 'run';
-		add: 'python';
+		add: 'python'.
+	self settings serverDebugMode ifTrue:
+		[ args addAll: { 
+			'-m'. 
+			'debugpy'. 
+			'--listen'. 
+			self settings debugSocketAddress printAddress. 
+			'--wait-for-client'. } ].
+	args
 		add: self pythonMainFile fullName;
 		add: '--port';
 		add: self settings pythonSocketAddress port asString;
@@ -131,14 +219,55 @@ PBPharoPipenvProcess >> setDefaultEnvironmentVariables [
 { #category : #'start-stop' }
 PBPharoPipenvProcess >> start [
 	process := self newProcess.
+
 	process run.
+	self settings serverDebugMode ifTrue:
+		[ self startServerDebugger ].
+]
+
+{ #category : #'start-stop' }
+PBPharoPipenvProcess >> startServerDebugger [
+	"Start the debugger, tell the server to run and set up inspection on halt"
+
+	"Give the server time to start"
+	1 second wait.
+	serverDebugger := DAPPythonDebugger new 
+		localRoot: self workingDirectory;
+		connectTo: #[127 0 0 1] port: self settings debugSocketAddress port.
+	serverDebugger announcer 
+		when: DAPThreadStateChanged 
+		do: [ :announcement | self debuggerStateChangedAction: announcement ].
+
+]
+
+{ #category : #accessing }
+PBPharoPipenvProcess >> stderr [
+	"Answer the process stderr contents"
+
+	^ process stderr
+]
+
+{ #category : #accessing }
+PBPharoPipenvProcess >> stdout [ 
+	"Answer the process stdout contents"
+
+	^ process stdout
 ]
 
 { #category : #'start-stop' }
 PBPharoPipenvProcess >> stop [
 	process ifNil: [ ^ self ].
-	[process queryExitStatus ifNil: [ process terminate ]] 
+	[ process queryExitStatus ifNil: [ process terminate ]] 
 		on: Error 
 		do: [ :e | "Do nothing."].
-	process closeAndCleanStreams
+	process closeAndCleanStreams.
+	process := nil.
+]
+
+{ #category : #'start-stop' }
+PBPharoPipenvProcess >> stopServerDebugger [
+	"Close the debugger and deregister"
+
+	serverDebugger close.
+	serverDebugger announcer unsubscribe: self debuggerStateChangedAction
 ]