fix: Non-"migrated" scrapy not working anymore (#800)

Author: vladfrangu

src/commands/run.ts

@@ -185,7 +185,7 @@ export class RunCommand extends ApifyCommand<typeof RunCommand> {
 			runType = RunType.Script;
 			entrypoint = cwdEntrypoint.script;
 		} else if (cwdEntrypoint?.path) {
-			runType = type === ProjectLanguage.Python ? RunType.Module : RunType.DirectFile;
+			runType = type !== ProjectLanguage.JavaScript ? RunType.Module : RunType.DirectFile;
 			entrypoint = cwdEntrypoint.path;
 		} else {
 			error({

src/lib/hooks/useCwdProject.ts

@@ -77,6 +77,15 @@ export async function useCwdProject({
 				project.entrypoint = {
 					path: scrapyProject.configuration.get('apify', 'mainpy_location')!,
 				};
+			} else {
+				// Fallback for scrapy projects that use apify, but are not "migrated" (like our templates)
+				const pythonFile = await checkPythonProject(cwd);
+
+				if (pythonFile) {
+					project.entrypoint = {
+						path: pythonFile,
+					};
+				}
 			}
 
 			return;

test/fixtures/commands/run/python/python-scrapy-template-works.test.ts

@@ -0,0 +1,46 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+import { getLocalDatasetPath } from '../../../../../src/lib/utils.js';
+import { safeLogin, useAuthSetup } from '../../../../__setup__/hooks/useAuthSetup.js';
+import { useTempPath } from '../../../../__setup__/hooks/useTempPath.js';
+
+const actorName = 'python-scrapy-template-works';
+
+const { beforeAllCalls, afterAllCalls, joinPath, toggleCwdBetweenFullAndParentPath } = useTempPath(actorName, {
+	create: true,
+	remove: true,
+	cwd: true,
+	cwdParent: true,
+});
+
+useAuthSetup({ perTest: false });
+
+const { CreateCommand } = await import('../../../../../src/commands/create.js');
+const { RunCommand } = await import('../../../../../src/commands/run.js');
+
+describe('python-scrapy-template-works', () => {
+	beforeAll(async () => {
+		await beforeAllCalls();
+
+		await safeLogin();
+
+		await CreateCommand.run([actorName, '--template', 'python-scrapy'], import.meta.url);
+		toggleCwdBetweenFullAndParentPath();
+	});
+
+	afterAll(async () => {
+		await afterAllCalls();
+	});
+
+	it('should run the actor', async () => {
+		await RunCommand.run([], import.meta.url);
+
+		const datasetDirectory = joinPath(getLocalDatasetPath('default'));
+		const datasetMetadataFile = join(datasetDirectory, '__metadata__.json');
+		expect(existsSync(datasetMetadataFile)).toBe(true);
+
+		const datasetMetadata = JSON.parse(readFileSync(datasetMetadataFile, 'utf8'));
+		expect(datasetMetadata.item_count).toBeGreaterThanOrEqual(4);
+	});
+});